diff --git a/src/entity_manager/utils.cpp b/src/entity_manager/utils.cpp
index d3ff6b9..2184fd7 100644
--- a/src/entity_manager/utils.cpp
+++ b/src/entity_manager/utils.cpp
@@ -126,18 +126,25 @@
 // with.
 std::optional<std::string> templateCharReplace(
     nlohmann::json::iterator& keyPair, const DBusObject& object,
-    const size_t index, const std::optional<std::string>& replaceStr)
+    const size_t index, const std::optional<std::string>& replaceStr,
+    bool handleLeftOver)
 {
     for (const auto& [_, interface] : object)
     {
         auto ret = templateCharReplace(keyPair, interface, index, replaceStr);
         if (ret)
         {
-            handleLeftOverTemplateVars(keyPair);
+            if (handleLeftOver)
+            {
+                handleLeftOverTemplateVars(keyPair);
+            }
             return ret;
         }
     }
-    handleLeftOverTemplateVars(keyPair);
+    if (handleLeftOver)
+    {
+        handleLeftOverTemplateVars(keyPair);
+    }
     return std::nullopt;
 }