diff --git a/config/cgm_worker/replacement.properties b/config/cgm_worker/replacement.properties
index 7713cf6f..5b2cf7e4 100644
--- a/config/cgm_worker/replacement.properties
+++ b/config/cgm_worker/replacement.properties
@@ -1,3 +1,2 @@
 [MAIN]
-REPLACEMENT_CONFIG = config/cgm_worker/replacement_config.json
-QUERY_FILTER = now-2w
\ No newline at end of file
+REPLACEMENT_CONFIG = config/cgm_worker/replacement_config.json
\ No newline at end of file
diff --git a/config/cgm_worker/replacement_conf.json b/config/cgm_worker/replacement_conf.json
index 3772c501..02e60153 100644
--- a/config/cgm_worker/replacement_conf.json
+++ b/config/cgm_worker/replacement_conf.json
@@ -7,6 +7,9 @@
         "timeHorizon": {
             "Request_list": ["ID", "1D", "2D", "WK", "1D", "MO", "YR"]
         },
+        "replacementLength": {
+            "Request_list": ["2w", "2w", "2w", "2w", "2w", "1m", "4m"]
+        },
         "month_ahead": {
             "hours": ["07:30", "08:30", "09:30", "06:30", "05:30", "04:30"],
             "business_type": ["1D"]
diff --git a/emf/model_merger/replacement.py b/emf/model_merger/replacement.py
index 43a4b8b6..3572bd69 100644
--- a/emf/model_merger/replacement.py
+++ b/emf/model_merger/replacement.py
@@ -35,9 +35,11 @@ def run_replacement(tso_list: list,
     replacements = pd.DataFrame()
     # TODO time horizon exclusion logic + exclude available models from query
     # TODO put in query object type if CGM metadata objects will be stored
+    # Get replacement length by time horizon
+    query_filter = 'now-' + config["replacementLength"]["Request_list"][config["timeHorizon"]["Request_list"].index(time_horizon)]
+    # Query for available replacement models
     query = {"pmd:TSO.keyword": tso_list, "valid": True, "data-source": data_source}
-    body = query_data(query, QUERY_FILTER)
-    model_df = pd.DataFrame(body)
+    model_df = pd.DataFrame(query_data(query, query_filter))
 
     # Set scenario dat to UTC
     if not model_df.empty: