diff --git a/.circleci/config.yml b/.circleci/config.yml
index 87433a3d7..0b8bcb7a6 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -108,7 +108,7 @@ jobs:
 
   release:
     docker:
-      - image: circleci/node:12
+      - image: circleci/node:14
     steps:
       - checkout
       - run: npx semantic-release
diff --git a/pytest_splunk_addon/standard_lib/fields_tests/test_templates.py b/pytest_splunk_addon/standard_lib/fields_tests/test_templates.py
index a585c165b..7136260a1 100644
--- a/pytest_splunk_addon/standard_lib/fields_tests/test_templates.py
+++ b/pytest_splunk_addon/standard_lib/fields_tests/test_templates.py
@@ -336,12 +336,14 @@ def test_savedsearches(
         latest_time = splunk_searchtime_fields_savedsearches["dispatch.latest_time"]
 
         temp_search_query = search_query.split("|")
-        temp_search_query[0] += " earliest_time = {0} latest_time = {1} ".format(
-            earliest_time, latest_time
-        )
-        search_query = "|".join(temp_search_query)
-
-        search = f"search {search_query}"
+        if temp_search_query[0].find("savedsearch") == -1 and (len(temp_search_query) < 2 or temp_search_query[1].find("savedsearch") == -1) :
+            temp_search_query[0] += " earliest_time = {0} latest_time = {1} ".format(
+                earliest_time, latest_time
+            )
+            search_query = "|".join(temp_search_query)
+            search = f"search {search_query}"
+        else:
+            search = "|".join(temp_search_query)
 
         self.logger.info(f"Search: {search}")