diff --git a/project/assets/database/templates/repeatableQuests.json b/project/assets/database/templates/repeatableQuests.json
index c22ffb01..fc407b48 100644
--- a/project/assets/database/templates/repeatableQuests.json
+++ b/project/assets/database/templates/repeatableQuests.json
@@ -1,520 +1,513 @@
 {
-	"templates": {
-		"Elimination": {
-			"_id": null,
-			"traderId": "5935c25fb3acc3127c3d8cd9",
-			"location": null,
-			"image": "/files/quest/icon/616d993bc8c5ad2ab30ff6ba.jpg",
-			"type": "Elimination",
-			"isKey": false,
-			"restartable": false,
-			"instantComplete": false,
-			"secretQuest": false,
-			"canShowNotificationsInGame": true,
-			"rewards": {
-				"Started": [],
-				"Success": [],
-				"Fail": []
-			},
-			"conditions": {
-				"AvailableForStart": [],
-				"AvailableForFinish": [
-					{
-						"_props": {
-							"id": "618c1de4d4cd91439f3de4ae",
-							"parentId": "",
-							"dynamicLocale": true,
-							"index": 0,
-							"visibilityConditions": [],
-							"value": 1,
-							"type": "Elimination",
-							"oneSessionOnly": false,
-							"doNotResetIfCounterCompleted": false,
-							"counter": {
-								"id": "618c1de4d4cd91439f3de4ac",
-								"conditions": [
-									{
-										"_props": {
-											"target": "Savage",
-											"value": 1,
-											"savageRole": [
-												"bossBully"
-											],
-											"id": "618c1de4d4cd91439f3de4ad",
-											"dynamicLocale": true
-										},
-										"_parent": "Kills"
-									}
-								]
-							}
-						},
-						"_parent": "CounterCreator",
-						"dynamicLocale": true
-					}
-				],
-				"Fail": []
-			},
-			"name": "{templateId} name {traderId}",
-			"note": "{templateId} note {traderId}",
-			"description": "{templateId} description {traderId} 0",
-			"successMessageText": "{templateId} successMessageText {traderId} 0",
-			"failMessageText": "{templateId} failMessageText {traderId} 0",
-			"startedMessageText": "{templateId} startedMessageText {traderId} 0",
-			"changeQuestMessageText": "{templateId} changeQuestMessageText {traderId} 0",
-			"templateId": "{templateId}",
-			"changeCost": [
-				{
-					"templateId": "5449016a4bdc2d6f028b456f",
-					"count": 5000
-				}
-			],
-			"changeStandingCost": 0
-		},
-		"Completion": {
-			"_id": "61943a75eb60e11b7965cdbf4",
-			"traderId": "58330581ace78e27b8b10cee",
-			"location": "any",
-			"image": "/files/quest/icon/616d993bc8c5ad2ab30ff6ba.jpg",
-			"type": "Completion",
-			"isKey": false,
-			"restartable": false,
-			"instantComplete": false,
-			"secretQuest": false,
-			"canShowNotificationsInGame": true,
-			"rewards": {
-				"Started": [],
-				"Success": [],
-				"Fail": []
-			},
-			"conditions": {
-				"AvailableForStart": [],
-				"AvailableForFinish": [],
-				"Fail": []
-			},
-			"name": "{templateId} name {traderId}",
-			"note": "{templateId} note {traderId}",
-			"description": "{templateId} description {traderId} 0",
-			"successMessageText": "{templateId} successMessageText {traderId} 0",
-			"failMessageText": "{templateId} failMessageText {traderId} 0",
-			"startedMessageText": "{templateId} startedMessageText {traderId} 0",
-			"changeQuestMessageText": "{templateId} changeQuestMessageText {traderId} 0",
-			"templateId": "{templateId}",
-			"changeCost": [
-				{
-					"templateId": "5449016a4bdc2d6f028b456f",
-					"count": 5000
-				}
-			],
-			"changeStandingCost": 0
-		},
-		"Exploration": {
-			"_id": null,
-			"traderId": "54cb50c76803fa8b248b4571",
-			"location": null,
-			"image": "/files/quest/icon/616d993bc8c5ad2ab30ff6ba.jpg",
-			"type": "Exploration",
-			"isKey": false,
-			"restartable": false,
-			"instantComplete": false,
-			"secretQuest": false,
-			"canShowNotificationsInGame": true,
-			"rewards": {
-				"Started": [],
-				"Success": [],
-				"Fail": []
-			},
-			"conditions": {
-				"AvailableForStart": [],
-				"AvailableForFinish": [
-					{
-						"_props": {
-							"id": "618c1de4d4cd91439f3de4a5",
-							"parentId": "",
-							"dynamicLocale": true,
-							"index": 0,
-							"visibilityConditions": [],
-							"value": 1,
-							"type": "Completion",
-							"oneSessionOnly": false,
-							"doNotResetIfCounterCompleted": false,
-							"counter": {
-								"id": "618c1de4d4cd91439f3de4a4",
-								"conditions": [
-									{
-										"_props": {
-											"status": [
-												"Survived"
-											],
-											"id": "618c1de4d4cd91439f3de4a3",
-											"dynamicLocale": true
-										},
-										"_parent": "ExitStatus"
-									},
-									{
-										"_props": {
-											"target": [],
-											"id": "618c1de4d4cd91439f3de4a2",
-											"dynamicLocale": true
-										},
-										"_parent": "Location"
-									}
-								]
-							}
-						},
-						"_parent": "CounterCreator",
-						"dynamicLocale": true
-					}
-				],
-				"Fail": []
-			},
-			"name": "{templateId} name {traderId}",
-			"note": "{templateId} note {traderId}",
-			"description": "{templateId} description {traderId} 0",
-			"successMessageText": "{templateId} successMessageText {traderId} 0",
-			"failMessageText": "{templateId} failMessageText {traderId} 0",
-			"startedMessageText": "{templateId} startedMessageText {traderId} 0",
-			"changeQuestMessageText": "{templateId} changeQuestMessageText {traderId} 0",
-			"templateId": "{templateId}",
-			"changeCost": [
-				{
-					"templateId": "5449016a4bdc2d6f028b456f",
-					"count": 5000
-				}
-			],
-			"changeStandingCost": 0
-		},
-		"Pickup": {
-                    "_id": "64cfb3818db9f48b3f0b0a759",
-                    "traderId": "579dc571d53a0658a154fbec",
-                    "location": "any",
-                    "image": "/files/quest/icon/62bd61b1b818ff064405b827.jpg",
-                    "type": "PickUp",
-                    "isKey": false,
-                    "restartable": false,
-                    "instantComplete": false,
-                    "secretQuest": false,
-                    "canShowNotificationsInGame": true,
-                    "rewards": {
-                        "Started": [],
-                        "Success": [],
-                        "Fail": []
-                    },
-                    "conditions": {
-                        "AvailableForStart": [],
-                        "AvailableForFinish": [{
-                                "_props": {
-                                    "id": "64cfb3818db9f48b3f0b0a6f",
-                                    "parentId": "",
-                                    "dynamicLocale": false,
-                                    "index": 0,
-                                    "visibilityConditions": [],
-                                    "globalQuestCounterId": null,
-                                    "target": ["5b47574386f77428ca22b336"],
-                                    "value": 7,
-                                    "minDurability": 0,
-                                    "maxDurability": 100,
-                                    "dogtagLevel": 0,
-                                    "onlyFoundInRaid": false,
-                                    "isEncoded": false,
-                                    "countInRaid": true
-                                },
-                                "_parent": "FindItem",
-                                "dynamicLocale": false
-                            }, {
-                                "_props": {
-                                    "id": "64cfb3818db9f48b3f0b0a74",
-                                    "parentId": "",
-                                    "dynamicLocale": true,
-                                    "index": 0,
-                                    "visibilityConditions": [],
-                                    "globalQuestCounterId": null,
-                                    "value": 1,
-                                    "type": "PickUp",
-                                    "completeInSeconds": 0,
-                                    "oneSessionOnly": true,
-                                    "doNotResetIfCounterCompleted": false,
-                                    "counter": {
-                                        "id": "64cfb3818db9f48b3f0b0a73",
-                                        "conditions": [{
-                                                "_props": {
-                                                    "target": ["any"],
-                                                    "id": "64cfb3818db9f48b3f0b0a70",
-                                                    "dynamicLocale": true
-                                                },
-                                                "_parent": "Location"
-                                            }, {
-                                                "_props": {
-                                                    "status": ["Survived"],
-                                                    "id": "64cfb3818db9f48b3f0b0a71",
-                                                    "dynamicLocale": true
-                                                },
-                                                "_parent": "ExitStatus"
-                                            }, {
-                                                "_props": {
-                                                    "equipmentInclusive": [["5b47574386f77428ca22b336"]],
-                                                    "IncludeNotEquippedItems": true,
-                                                    "id": "64cfb3818db9f48b3f0b0a72",
-                                                    "dynamicLocale": true
-                                                },
-                                                "_parent": "Equipment"
-                                            }
-                                        ]
+    "templates": {
+        "Elimination": {
+            "_id": null,
+            "traderId": "5935c25fb3acc3127c3d8cd9",
+            "location": null,
+            "image": "/files/quest/icon/616d993bc8c5ad2ab30ff6ba.jpg",
+            "type": "Elimination",
+            "isKey": false,
+            "restartable": false,
+            "instantComplete": false,
+            "secretQuest": false,
+            "canShowNotificationsInGame": true,
+            "rewards": {
+                "Started": [],
+                "Success": [],
+                "Fail": []
+            },
+            "conditions": {
+                "AvailableForStart": [],
+                "AvailableForFinish": [{
+                        "_props": {
+                            "id": "618c1de4d4cd91439f3de4ae",
+                            "parentId": "",
+                            "dynamicLocale": true,
+                            "index": 0,
+                            "visibilityConditions": [],
+                            "value": 1,
+                            "type": "Elimination",
+                            "oneSessionOnly": false,
+                            "doNotResetIfCounterCompleted": false,
+                            "counter": {
+                                "id": "618c1de4d4cd91439f3de4ac",
+                                "conditions": [{
+                                        "_props": {
+                                            "target": "Savage",
+                                            "value": 1,
+                                            "savageRole": [
+                                                "bossBully"
+                                            ],
+                                            "id": "618c1de4d4cd91439f3de4ad",
+                                            "dynamicLocale": true
+                                        },
+                                        "_parent": "Kills"
                                     }
-                                },
-                                "_parent": "CounterCreator",
-                                "dynamicLocale": true
+                                ]
                             }
-                        ],
-                        "Fail": []
-                    },
-                    "side": "Scav",
-                    "questStatus": {},
-                    "name": "{templateId} name {traderId}",
-                    "note": "{templateId} note {traderId}",
-                    "description": "{templateId} description {traderId} 0",
-                    "successMessageText": "{templateId} successMessageText {traderId} 0",
-                    "failMessageText": "{templateId} failMessageText {traderId} 0",
-                    "startedMessageText": "{templateId} startedMessageText {traderId} 0",
-                    "changeQuestMessageText": "{templateId} changeQuestMessageText {traderId} 0",
-                    "acceptPlayerMessage": "{templateId} acceptPlayerMessage {traderId}",
-                    "declinePlayerMessage": "{templateId} declinePlayerMessage {traderId}",
-                    "completePlayerMessage": "{templateId} completePlayerMessage {traderId}",
-                    "templateId": "{templateId}",
-                    "changeCost": [{
-                            "templateId": "5449016a4bdc2d6f028b456f",
-                            "count": 12000
-                        }
-                    ],
-                    "changeStandingCost": 0
+                        },
+                        "_parent": "CounterCreator",
+                        "dynamicLocale": true
+                    }
+                ],
+                "Fail": []
+            },
+            "name": "{templateId} name {traderId}",
+            "note": "{templateId} note {traderId}",
+            "description": "{templateId} description {traderId} 0",
+            "successMessageText": "{templateId} successMessageText {traderId} 0",
+            "failMessageText": "{templateId} failMessageText {traderId} 0",
+            "startedMessageText": "{templateId} startedMessageText {traderId} 0",
+            "changeQuestMessageText": "{templateId} changeQuestMessageText {traderId} 0",
+            "templateId": "{templateId}",
+            "changeCost": [{
+                    "templateId": "5449016a4bdc2d6f028b456f",
+                    "count": 5000
                 }
-	},
-	"rewards": {
-		"itemsBlacklist": [
-			"5cffa483d7ad1a049e54ef1c"
-		]
-	},
-	"data": {
-		"Completion": {
-			"itemsBlacklist": [
-				{"minPlayerLevel": 1, "itemIds": [
-					"5485a8684bdc2da71d8b4567",
-					"543be5e94bdc2df1348b4568"
-				]}
-			],
-			"itemsWhitelist": [
-				{
-					"minPlayerLevel": 1,
-					"itemIds": [
-						"544fb37f4bdc2dee738b4567",
-						"590c661e86f7741e566b646a",
-						"544fb3364bdc2d34748b456a",
-						"5e831507ea0a7c419c2f9bd9",
-						"60098af40accd37ef2175f27",
-						"57347d3d245977448f7b7f61",
-						"5751487e245977207e26a315",
-						"57347d8724597744596b4e76",
-						"57513f07245977207e26a311",
-						"575146b724597720a27126d5",
-						"619cc01e0a7c3a1a2731940c",
-						"57347b8b24597737dd42e192",
-						"59f32bb586f774757e1e8442",
-						"59f32c3b86f77472a31742f0",
-						"56742c284bdc2d98058b456d",
-						"590c31c586f774245e3141b2",
-						"59e35ef086f7741777737012",
-						"57347c77245977448d35f6e2",
-						"57347c5b245977448d35f6e1",
-						"56742c2e4bdc2d95058b456d",
-						"5734770f24597738025ee254",
-						"573475fb24597737fb1379e1",
-						"573476d324597737da2adc13",
-						"573476f124597737e04bf328",
-						"5672cb124bdc2d1a0f8b4568",
-						"5672cb304bdc2dc2088b456a",
-						"590a3cd386f77436f20848cb",
-						"5734779624597737e04bf329",
-						"573477e124597737dd42e191",
-						"5734781f24597737e04bf32a",
-						"57347c1124597737fb1379e3",
-						"5734795124597738002c6176",
-						"590c2c9c86f774245b1f03f2",
-						"5909e99886f7740c983b9984",
-						"577e1c9d2459773cd707c525",
-						"590c2d8786f774245b1f03f3",
-						"590c311186f77424d1667482",
-						"590c2b4386f77425357b6123",
-						"59e3606886f77417674759a5",
-						"59e361e886f774176c10a2a5",
-						"590c346786f77423e50ed342",
-						"590c35a486f774273531c822",
-						"59e35abd86f7741778269d82",
-						"590a373286f774287540368b",
-						"5af0484c86f7740f02001f7f",
-						"5d40425986f7743185265461",
-						"5d1b3f2d86f774253763b735",
-						"5d1b31ce86f7742523398394",
-						"5d1b392c86f77425243e98fe",
-						"5d1c774f86f7746d6620f8db",
-						"5d1b313086f77425227d1678",
-						"5e2af51086f7746d3f3c3402",
-						"5c13cd2486f774072c757944",
-						"57347baf24597738002c6178",
-						"5755356824597772cb798962",
-						"590c595c86f7747884343ad7",
-						"5c13cef886f774072e618e82",
-						"544fb25a4bdc2dfb738b4567",
-						"5e2af4a786f7746d3f3c3400",
-						"5af0454c86f7746bf20992e8",
-						"5648a7494bdc2d9d488b4583",
-						"56e335e4d2720b6c058b456d",
-						"5b432d215acfc4771e1c6624",
-						"5e8488fa988a8701445df1e4",
-						"544fb45d4bdc2dee738b4568",
-						"5d02778e86f774203e7dedbe",
-						"590c5d4b86f774784e1b9c45",
-						"5e8f3423fd7471236e6e3b64",
-						"57347d7224597744596b4e72",
-						"5751435d24597720a27126d1",
-						"60098b1705871270cd5352a1",
-						"5d1b309586f77425227d1676",
-						"590a3b0486f7743954552bdb",
-						"59e36c6f86f774176c10a2a7",
-						"5d6fc87386f77449db3db94e",
-						"590a391c86f774385a33c404",
-						"5d1c819a86f774771b0acd6c",
-						"57347cd0245977445a2d6ff1",
-						"5644bd2b4bdc2d3b4c8b4572",
-						"59d6088586f774275f37482f",
-						"590c5a7286f7747884343aea",
-						"5d6e6806a4b936088465b17e",
-						"56742c324bdc2d150f8b456d",
-						"5e340dcdcb6d5863cc5e5efb",
-						"573720e02459776143012541",
-						"5c06779c86f77426e00dd782",
-						"5c06782b86f77426df5407d2",
-						"590a3efd86f77437d351a25b"
-					]
-				},
-				{
-					"minPlayerLevel": 15,
-					"itemIds": [
-						"5d40412b86f7743cb332ac3a",
-						"59e3556c86f7741776641ac2",
-						"59e358a886f7741776641ac3",
-						"5e4abfed86f77406a2713cf7",
-						"59e7635f86f7742cbf2c1095",
-						"5e2af47786f7746d404f3aaa",
-						"5648a69d4bdc2ded0b8b457b",
-						"5d1b371186f774253763a656",
-						"5e2af29386f7746d4159f077",
-						"55d482194bdc2d1d4e8b456b",
-						"590c5bbd86f774785762df04",
-						"59e763f286f7742ee57895da",
-						"59e35cbb86f7741778269d83",
-						"5c12688486f77426843c7d32",
-						"5d1b385e86f774252167b98a",
-						"5b4335ba86f7744d2837a264",
-						"5d1b3a5d86f774252167ba22",
-						"590c678286f77426c9660122",
-						"5fca138c2a7b221b2852a5c6",
-						"544fb3f34bdc2d03748b456a",
-						"5c0e531286f7747fa54205c2",
-						"5ed51652f6c34d2cc26336a1",
-						"5c052e6986f7746b207bc3c9",
-						"544fb6cc4bdc2d34748b456e",
-						"5734773724597737fd047c14",
-						"59e3577886f774176a362503",
-						"573476f124597737e04bf328",
-						"590a358486f77429692b2790",
-						"5a0c27731526d80618476ac4",
-						"5d1b2fa286f77425227d1674",
-						"5ac4cd105acfc40016339859",
-						"5672cb724bdc2dc2088b456b",
-						"5d6fc78386f77449d825f9dc",
-						"5d6fc87386f77449db3db94e",
-						"590a3c0a86f774385a33c450",
-						"5d0376a486f7747d8050965c",
-						"5d1b2ffd86f77425243e8d17",
-						"5733279d245977289b77ec24",
-						"619cbfeb6b8a1b37a54eebfa",
-						"590c392f86f77444754deb29",
-						"59e35de086f7741778269d84",
-						"619cbf476b8a1b37a54eebf8",
-						"590c651286f7741e566b6461"
-					]
-				},
-				{
-					"minPlayerLevel": 25,
-					"itemIds": [
-						"590c621186f774138d11ea29",
-						"5d1b376e86f774252519444e",
-						"59faf7ca86f7740dbe19f6c2",
-						"5734758f24597738025ee253",
-						"5d235a5986f77443f6329bc6",
-						"59e3639286f7741777737013",
-						"5448be9a4bdc2dfd2f8b456a",
-						"5d0379a886f77420407aa271",
-						"5c12613b86f7743bbe2c3f76",
-						"5df8a42886f77412640e2e75",
-						"5d1b2f3f86f774252167a52c",
-						"5df8a4d786f77412672a1e3b",
-						"5755383e24597772cb798966",
-						"60098ad7c2240c0fe85c570a",
-						"590c657e86f77412b013051d",
-						"5d02797c86f774203f38e30a",
-						"5c0e531d86f7747fa23f4d42",
-						"5c0e530286f7747fa1419862",
-						"5c0530ee86f774697952d952",
-						"5d40407c86f774318526545a",
-						"5d403f9186f7743cac3f229b",
-						"5c0fa877d174af02a012e1cf",
-						"5751496424597720a27126da",
-						"5d1b33a686f7742523398398",
-						"60391afc25aff57af81f7085",
-						"60391b0fb847c71012789415",
-						"60391a8b3364dc22b04d0ce5",
-						"619cbfccbedcde2f5b3f7bdd",
-						"5bc9be8fd4351e00334cae6e",
-						"573478bc24597738002c6175",
-						"590c37d286f77443be3d7827",
-						"590c645c86f77412b01304d9",
-						"5e2aedd986f7746d404f3aa4"
-					]
-				},
-				{
-					"minPlayerLevel": 40,
-					"itemIds": [
-						"59e3647686f774176a362507",
-						"5c052f6886f7746b1e3db148",
-						"5c052fb986f7746b2101e909",
-						"5c05300686f7746dce784e5d",
-						"5c05308086f7746b2101e90b",
-						"57347ca924597744596b4e71",
-						"590de7e986f7741b096e5f32",
-						"590de71386f774347051a052",
-						"60b0f561c4449e4cb624c1d7",
-						"5bc9bdb8d4351e003562b8a1",
-						"5bc9bc53d4351e00367fbcee",
-						"5bc9c049d4351e44f824d360",
-						"5d235b4d86f7742e017bc88a",
-						"5d03775b86f774203e7e0c4b",
-						"5d0377ce86f774186372f689",
-						"5d0375ff86f774186372f685",
-						"5d0378d486f77420421a5ff4",
-						"5e54f62086f774219b0f1937",
-						"5e54f6af86f7742199090bf3",
-						"5f745ee30acaeb0d490d8c5b",
-						"59e3658a86f7741776641ac4",
-						"5af0534a86f7743b6f354284",
-						"59faff1d86f7746c51718c9c",
-						"5bc9b355d4351e6d1509862a",
-						"5bc9b9ecd4351e3bac122519",
-						"5c12620d86f7743f8b198b72",
-						"5751a89d24597722aa0e8db0"
-					]
-				}
-			]
-		}
-	},
-	"samples": []
-}
\ No newline at end of file
+            ],
+            "changeStandingCost": 0
+        },
+        "Completion": {
+            "_id": "61943a75eb60e11b7965cdbf4",
+            "traderId": "58330581ace78e27b8b10cee",
+            "location": "any",
+            "image": "/files/quest/icon/616d993bc8c5ad2ab30ff6ba.jpg",
+            "type": "Completion",
+            "isKey": false,
+            "restartable": false,
+            "instantComplete": false,
+            "secretQuest": false,
+            "canShowNotificationsInGame": true,
+            "rewards": {
+                "Started": [],
+                "Success": [],
+                "Fail": []
+            },
+            "conditions": {
+                "AvailableForStart": [],
+                "AvailableForFinish": [],
+                "Fail": []
+            },
+            "name": "{templateId} name {traderId}",
+            "note": "{templateId} note {traderId}",
+            "description": "{templateId} description {traderId} 0",
+            "successMessageText": "{templateId} successMessageText {traderId} 0",
+            "failMessageText": "{templateId} failMessageText {traderId} 0",
+            "startedMessageText": "{templateId} startedMessageText {traderId} 0",
+            "changeQuestMessageText": "{templateId} changeQuestMessageText {traderId} 0",
+            "templateId": "{templateId}",
+            "changeCost": [{
+                    "templateId": "5449016a4bdc2d6f028b456f",
+                    "count": 5000
+                }
+            ],
+            "changeStandingCost": 0
+        },
+        "Exploration": {
+            "_id": null,
+            "traderId": "54cb50c76803fa8b248b4571",
+            "location": null,
+            "image": "/files/quest/icon/616d993bc8c5ad2ab30ff6ba.jpg",
+            "type": "Exploration",
+            "isKey": false,
+            "restartable": false,
+            "instantComplete": false,
+            "secretQuest": false,
+            "canShowNotificationsInGame": true,
+            "rewards": {
+                "Started": [],
+                "Success": [],
+                "Fail": []
+            },
+            "conditions": {
+                "AvailableForStart": [],
+                "AvailableForFinish": [{
+                        "_props": {
+                            "id": "618c1de4d4cd91439f3de4a5",
+                            "parentId": "",
+                            "dynamicLocale": true,
+                            "index": 0,
+                            "visibilityConditions": [],
+                            "value": 1,
+                            "type": "Completion",
+                            "oneSessionOnly": false,
+                            "doNotResetIfCounterCompleted": false,
+                            "counter": {
+                                "id": "618c1de4d4cd91439f3de4a4",
+                                "conditions": [{
+                                        "_props": {
+                                            "status": [
+                                                "Survived"
+                                            ],
+                                            "id": "618c1de4d4cd91439f3de4a3",
+                                            "dynamicLocale": true
+                                        },
+                                        "_parent": "ExitStatus"
+                                    }, {
+                                        "_props": {
+                                            "target": [],
+                                            "id": "618c1de4d4cd91439f3de4a2",
+                                            "dynamicLocale": true
+                                        },
+                                        "_parent": "Location"
+                                    }
+                                ]
+                            }
+                        },
+                        "_parent": "CounterCreator",
+                        "dynamicLocale": true
+                    }
+                ],
+                "Fail": []
+            },
+            "name": "{templateId} name {traderId}",
+            "note": "{templateId} note {traderId}",
+            "description": "{templateId} description {traderId} 0",
+            "successMessageText": "{templateId} successMessageText {traderId} 0",
+            "failMessageText": "{templateId} failMessageText {traderId} 0",
+            "startedMessageText": "{templateId} startedMessageText {traderId} 0",
+            "changeQuestMessageText": "{templateId} changeQuestMessageText {traderId} 0",
+            "acceptPlayerMessage": "{templateId} acceptPlayerMessage {traderId}",
+            "declinePlayerMessage": "{templateId} declinePlayerMessage {traderId}",
+            "completePlayerMessage": "{templateId} completePlayerMessage {traderId}",
+            "templateId": "{templateId}",
+            "changeCost": [{
+                    "templateId": "5449016a4bdc2d6f028b456f",
+                    "count": 5000
+                }
+            ],
+            "changeStandingCost": 0
+        },
+        "Pickup": {
+            "_id": "64cfb3818db9f48b3f0b0a759",
+            "traderId": "{traderId}",
+            "location": "any",
+            "image": "/files/quest/icon/62bd61b1b818ff064405b827.jpg",
+            "type": "PickUp",
+            "isKey": false,
+            "restartable": false,
+            "instantComplete": false,
+            "secretQuest": false,
+            "canShowNotificationsInGame": true,
+            "rewards": {
+                "Started": [],
+                "Success": [],
+                "Fail": []
+            },
+            "conditions": {
+                "AvailableForStart": [],
+                "AvailableForFinish": [{
+                        "_props": {
+                            "id": "64cfb3818db9f48b3f0b0a6f",
+                            "parentId": "",
+                            "dynamicLocale": false,
+                            "index": 0,
+                            "visibilityConditions": [],
+                            "globalQuestCounterId": null,
+                            "target": ["5b47574386f77428ca22b336"],
+                            "value": 7,
+                            "minDurability": 0,
+                            "maxDurability": 100,
+                            "dogtagLevel": 0,
+                            "onlyFoundInRaid": false,
+                            "isEncoded": false,
+                            "countInRaid": true
+                        },
+                        "_parent": "FindItem",
+                        "dynamicLocale": false
+                    }, {
+                        "_props": {
+                            "id": "64cfb3818db9f48b3f0b0a74",
+                            "parentId": "",
+                            "dynamicLocale": true,
+                            "index": 0,
+                            "visibilityConditions": [],
+                            "globalQuestCounterId": null,
+                            "value": 1,
+                            "type": "PickUp",
+                            "completeInSeconds": 0,
+                            "oneSessionOnly": true,
+                            "doNotResetIfCounterCompleted": false,
+                            "counter": {
+                                "id": "64cfb3818db9f48b3f0b0a73",
+                                "conditions": [{
+                                        "_props": {
+                                            "target": ["any"],
+                                            "id": "64cfb3818db9f48b3f0b0a70",
+                                            "dynamicLocale": true
+                                        },
+                                        "_parent": "Location"
+                                    }, {
+                                        "_props": {
+                                            "status": ["Survived"],
+                                            "id": "64cfb3818db9f48b3f0b0a71",
+                                            "dynamicLocale": true
+                                        },
+                                        "_parent": "ExitStatus"
+                                    }, {
+                                        "_props": {
+                                            "equipmentInclusive": [["5b47574386f77428ca22b336"]],
+                                            "IncludeNotEquippedItems": true,
+                                            "id": "64cfb3818db9f48b3f0b0a72",
+                                            "dynamicLocale": true
+                                        },
+                                        "_parent": "Equipment"
+                                    }
+                                ]
+                            }
+                        },
+                        "_parent": "CounterCreator",
+                        "dynamicLocale": true
+                    }
+                ],
+                "Fail": []
+            },
+            "side": "Scav",
+            "questStatus": {},
+            "name": "{templateId} name {traderId}",
+            "note": "{templateId} note {traderId}",
+            "description": "{templateId} description {traderId} 0",
+            "successMessageText": "{templateId} successMessageText {traderId} 0",
+            "failMessageText": "{templateId} failMessageText {traderId} 0",
+            "startedMessageText": "{templateId} startedMessageText {traderId} 0",
+            "changeQuestMessageText": "{templateId} changeQuestMessageText {traderId} 0",
+            "acceptPlayerMessage": "{templateId} acceptPlayerMessage {traderId}",
+            "declinePlayerMessage": "{templateId} declinePlayerMessage {traderId}",
+            "completePlayerMessage": "{templateId} completePlayerMessage {traderId}",
+            "templateId": "{templateId}",
+            "changeCost": [{
+                    "templateId": "5449016a4bdc2d6f028b456f",
+                    "count": 12000
+                }
+            ],
+            "changeStandingCost": 0
+        }
+    },
+    "rewards": {
+        "itemsBlacklist": [
+            "5cffa483d7ad1a049e54ef1c"
+        ]
+    },
+    "data": {
+        "Completion": {
+            "itemsBlacklist": [{
+                    "minPlayerLevel": 1,
+                    "itemIds": [
+                        "5485a8684bdc2da71d8b4567",
+                        "543be5e94bdc2df1348b4568"
+                    ]
+                }
+            ],
+            "itemsWhitelist": [{
+                    "minPlayerLevel": 1,
+                    "itemIds": [
+                        "544fb37f4bdc2dee738b4567",
+                        "590c661e86f7741e566b646a",
+                        "544fb3364bdc2d34748b456a",
+                        "5e831507ea0a7c419c2f9bd9",
+                        "60098af40accd37ef2175f27",
+                        "57347d3d245977448f7b7f61",
+                        "5751487e245977207e26a315",
+                        "57347d8724597744596b4e76",
+                        "57513f07245977207e26a311",
+                        "575146b724597720a27126d5",
+                        "619cc01e0a7c3a1a2731940c",
+                        "57347b8b24597737dd42e192",
+                        "59f32bb586f774757e1e8442",
+                        "59f32c3b86f77472a31742f0",
+                        "56742c284bdc2d98058b456d",
+                        "590c31c586f774245e3141b2",
+                        "59e35ef086f7741777737012",
+                        "57347c77245977448d35f6e2",
+                        "57347c5b245977448d35f6e1",
+                        "56742c2e4bdc2d95058b456d",
+                        "5734770f24597738025ee254",
+                        "573475fb24597737fb1379e1",
+                        "573476d324597737da2adc13",
+                        "573476f124597737e04bf328",
+                        "5672cb124bdc2d1a0f8b4568",
+                        "5672cb304bdc2dc2088b456a",
+                        "590a3cd386f77436f20848cb",
+                        "5734779624597737e04bf329",
+                        "573477e124597737dd42e191",
+                        "5734781f24597737e04bf32a",
+                        "57347c1124597737fb1379e3",
+                        "5734795124597738002c6176",
+                        "590c2c9c86f774245b1f03f2",
+                        "5909e99886f7740c983b9984",
+                        "577e1c9d2459773cd707c525",
+                        "590c2d8786f774245b1f03f3",
+                        "590c311186f77424d1667482",
+                        "590c2b4386f77425357b6123",
+                        "59e3606886f77417674759a5",
+                        "59e361e886f774176c10a2a5",
+                        "590c346786f77423e50ed342",
+                        "590c35a486f774273531c822",
+                        "59e35abd86f7741778269d82",
+                        "590a373286f774287540368b",
+                        "5af0484c86f7740f02001f7f",
+                        "5d40425986f7743185265461",
+                        "5d1b3f2d86f774253763b735",
+                        "5d1b31ce86f7742523398394",
+                        "5d1b392c86f77425243e98fe",
+                        "5d1c774f86f7746d6620f8db",
+                        "5d1b313086f77425227d1678",
+                        "5e2af51086f7746d3f3c3402",
+                        "5c13cd2486f774072c757944",
+                        "57347baf24597738002c6178",
+                        "5755356824597772cb798962",
+                        "590c595c86f7747884343ad7",
+                        "5c13cef886f774072e618e82",
+                        "544fb25a4bdc2dfb738b4567",
+                        "5e2af4a786f7746d3f3c3400",
+                        "5af0454c86f7746bf20992e8",
+                        "5648a7494bdc2d9d488b4583",
+                        "56e335e4d2720b6c058b456d",
+                        "5b432d215acfc4771e1c6624",
+                        "5e8488fa988a8701445df1e4",
+                        "544fb45d4bdc2dee738b4568",
+                        "5d02778e86f774203e7dedbe",
+                        "590c5d4b86f774784e1b9c45",
+                        "5e8f3423fd7471236e6e3b64",
+                        "57347d7224597744596b4e72",
+                        "5751435d24597720a27126d1",
+                        "60098b1705871270cd5352a1",
+                        "5d1b309586f77425227d1676",
+                        "590a3b0486f7743954552bdb",
+                        "59e36c6f86f774176c10a2a7",
+                        "5d6fc87386f77449db3db94e",
+                        "590a391c86f774385a33c404",
+                        "5d1c819a86f774771b0acd6c",
+                        "57347cd0245977445a2d6ff1",
+                        "5644bd2b4bdc2d3b4c8b4572",
+                        "59d6088586f774275f37482f",
+                        "590c5a7286f7747884343aea",
+                        "5d6e6806a4b936088465b17e",
+                        "56742c324bdc2d150f8b456d",
+                        "5e340dcdcb6d5863cc5e5efb",
+                        "573720e02459776143012541",
+                        "5c06779c86f77426e00dd782",
+                        "5c06782b86f77426df5407d2",
+                        "590a3efd86f77437d351a25b"
+                    ]
+                }, {
+                    "minPlayerLevel": 15,
+                    "itemIds": [
+                        "5d40412b86f7743cb332ac3a",
+                        "59e3556c86f7741776641ac2",
+                        "59e358a886f7741776641ac3",
+                        "5e4abfed86f77406a2713cf7",
+                        "59e7635f86f7742cbf2c1095",
+                        "5e2af47786f7746d404f3aaa",
+                        "5648a69d4bdc2ded0b8b457b",
+                        "5d1b371186f774253763a656",
+                        "5e2af29386f7746d4159f077",
+                        "55d482194bdc2d1d4e8b456b",
+                        "590c5bbd86f774785762df04",
+                        "59e763f286f7742ee57895da",
+                        "59e35cbb86f7741778269d83",
+                        "5c12688486f77426843c7d32",
+                        "5d1b385e86f774252167b98a",
+                        "5b4335ba86f7744d2837a264",
+                        "5d1b3a5d86f774252167ba22",
+                        "590c678286f77426c9660122",
+                        "5fca138c2a7b221b2852a5c6",
+                        "544fb3f34bdc2d03748b456a",
+                        "5c0e531286f7747fa54205c2",
+                        "5ed51652f6c34d2cc26336a1",
+                        "5c052e6986f7746b207bc3c9",
+                        "544fb6cc4bdc2d34748b456e",
+                        "5734773724597737fd047c14",
+                        "59e3577886f774176a362503",
+                        "573476f124597737e04bf328",
+                        "590a358486f77429692b2790",
+                        "5a0c27731526d80618476ac4",
+                        "5d1b2fa286f77425227d1674",
+                        "5ac4cd105acfc40016339859",
+                        "5672cb724bdc2dc2088b456b",
+                        "5d6fc78386f77449d825f9dc",
+                        "5d6fc87386f77449db3db94e",
+                        "590a3c0a86f774385a33c450",
+                        "5d0376a486f7747d8050965c",
+                        "5d1b2ffd86f77425243e8d17",
+                        "5733279d245977289b77ec24",
+                        "619cbfeb6b8a1b37a54eebfa",
+                        "590c392f86f77444754deb29",
+                        "59e35de086f7741778269d84",
+                        "619cbf476b8a1b37a54eebf8",
+                        "590c651286f7741e566b6461"
+                    ]
+                }, {
+                    "minPlayerLevel": 25,
+                    "itemIds": [
+                        "590c621186f774138d11ea29",
+                        "5d1b376e86f774252519444e",
+                        "59faf7ca86f7740dbe19f6c2",
+                        "5734758f24597738025ee253",
+                        "5d235a5986f77443f6329bc6",
+                        "59e3639286f7741777737013",
+                        "5448be9a4bdc2dfd2f8b456a",
+                        "5d0379a886f77420407aa271",
+                        "5c12613b86f7743bbe2c3f76",
+                        "5df8a42886f77412640e2e75",
+                        "5d1b2f3f86f774252167a52c",
+                        "5df8a4d786f77412672a1e3b",
+                        "5755383e24597772cb798966",
+                        "60098ad7c2240c0fe85c570a",
+                        "590c657e86f77412b013051d",
+                        "5d02797c86f774203f38e30a",
+                        "5c0e531d86f7747fa23f4d42",
+                        "5c0e530286f7747fa1419862",
+                        "5c0530ee86f774697952d952",
+                        "5d40407c86f774318526545a",
+                        "5d403f9186f7743cac3f229b",
+                        "5c0fa877d174af02a012e1cf",
+                        "5751496424597720a27126da",
+                        "5d1b33a686f7742523398398",
+                        "60391afc25aff57af81f7085",
+                        "60391b0fb847c71012789415",
+                        "60391a8b3364dc22b04d0ce5",
+                        "619cbfccbedcde2f5b3f7bdd",
+                        "5bc9be8fd4351e00334cae6e",
+                        "573478bc24597738002c6175",
+                        "590c37d286f77443be3d7827",
+                        "590c645c86f77412b01304d9",
+                        "5e2aedd986f7746d404f3aa4"
+                    ]
+                }, {
+                    "minPlayerLevel": 40,
+                    "itemIds": [
+                        "59e3647686f774176a362507",
+                        "5c052f6886f7746b1e3db148",
+                        "5c052fb986f7746b2101e909",
+                        "5c05300686f7746dce784e5d",
+                        "5c05308086f7746b2101e90b",
+                        "57347ca924597744596b4e71",
+                        "590de7e986f7741b096e5f32",
+                        "590de71386f774347051a052",
+                        "60b0f561c4449e4cb624c1d7",
+                        "5bc9bdb8d4351e003562b8a1",
+                        "5bc9bc53d4351e00367fbcee",
+                        "5bc9c049d4351e44f824d360",
+                        "5d235b4d86f7742e017bc88a",
+                        "5d03775b86f774203e7e0c4b",
+                        "5d0377ce86f774186372f689",
+                        "5d0375ff86f774186372f685",
+                        "5d0378d486f77420421a5ff4",
+                        "5e54f62086f774219b0f1937",
+                        "5e54f6af86f7742199090bf3",
+                        "5f745ee30acaeb0d490d8c5b",
+                        "59e3658a86f7741776641ac4",
+                        "5af0534a86f7743b6f354284",
+                        "59faff1d86f7746c51718c9c",
+                        "5bc9b355d4351e6d1509862a",
+                        "5bc9b9ecd4351e3bac122519",
+                        "5c12620d86f7743f8b198b72",
+                        "5751a89d24597722aa0e8db0"
+                    ]
+                }
+            ]
+        }
+    },
+    "samples": []
+}
diff --git a/project/src/controllers/QuestController.ts b/project/src/controllers/QuestController.ts
index b61eced1..162110ac 100644
--- a/project/src/controllers/QuestController.ts
+++ b/project/src/controllers/QuestController.ts
@@ -10,7 +10,7 @@ import { IPmcData } from "@spt-aki/models/eft/common/IPmcData";
 import { IQuestStatus } from "@spt-aki/models/eft/common/tables/IBotBase";
 import { Item } from "@spt-aki/models/eft/common/tables/IItem";
 import { AvailableForConditions, IQuest, Reward } from "@spt-aki/models/eft/common/tables/IQuest";
-import { IRepeatableQuest } from "@spt-aki/models/eft/common/tables/IRepeatableQuests";
+import { IPmcDataRepeatableQuest, IRepeatableQuest } from "@spt-aki/models/eft/common/tables/IRepeatableQuests";
 import { IItemEventRouterResponse } from "@spt-aki/models/eft/itemEvent/IItemEventRouterResponse";
 import { IAcceptQuestRequestData } from "@spt-aki/models/eft/quests/IAcceptQuestRequestData";
 import { ICompleteQuestRequestData } from "@spt-aki/models/eft/quests/ICompleteQuestRequestData";
@@ -373,7 +373,6 @@ export class QuestController
         }
 
         const questRewards = this.questHelper.getQuestRewardItems(<IQuest><unknown>repeatableQuestProfile, desiredQuestState);
-
         this.mailSendService.sendLocalisedNpcMessageToPlayer(
             sessionID,
             this.traderHelper.getTraderById(repeatableQuestProfile.traderId),
@@ -382,7 +381,15 @@ export class QuestController
             questRewards,
             this.timeUtil.getHoursAsSeconds(this.questConfig.redeemTime));
 
-        acceptQuestResponse.profileChanges[sessionID].quests = this.questHelper.getNewlyAccessibleQuestsWhenStartingQuest(acceptedQuest.qid, sessionID);
+        const repeatableSettings = pmcData.RepeatableQuests.find(x => x.name === repeatableQuestProfile.sptRepatableGroupName);
+        const responseData: IPmcDataRepeatableQuest = {
+            activeQuests: [repeatableQuestProfile],
+            name: repeatableSettings.name,
+            inactiveQuests: [],
+            endTime: repeatableSettings.endTime,
+            changeRequirement: repeatableSettings.changeRequirement
+        };
+        acceptQuestResponse.profileChanges[sessionID].repeatableQuests = [responseData];
 
         return acceptQuestResponse;
     }
@@ -401,6 +408,7 @@ export class QuestController
             if (matchingQuest)
             {
                 this.logger.debug(`Accepted repeatable quest ${acceptedQuest.qid} from ${repeatableQuest.name}`);
+                matchingQuest.sptRepatableGroupName = repeatableQuest.name;
                 
                 return matchingQuest;
             }
diff --git a/project/src/models/eft/common/tables/IRepeatableQuests.ts b/project/src/models/eft/common/tables/IRepeatableQuests.ts
index e61829d0..e570dbc9 100644
--- a/project/src/models/eft/common/tables/IRepeatableQuests.ts
+++ b/project/src/models/eft/common/tables/IRepeatableQuests.ts
@@ -73,6 +73,7 @@ export interface IRepeatableQuest
     templateId: string
     changeCost: IChangeCost[]
     changeStandingCost: number
+    sptRepatableGroupName?: string;
 }
 
 export interface IRewards