diff --git a/src/main/java/com/eactive/httpmockserver/client/dto/ApiRequestKeyValueDTO.java b/src/main/java/com/eactive/httpmockserver/client/dto/ApiRequestKeyValueDTO.java
index f73eee0..fe631c2 100644
--- a/src/main/java/com/eactive/httpmockserver/client/dto/ApiRequestKeyValueDTO.java
+++ b/src/main/java/com/eactive/httpmockserver/client/dto/ApiRequestKeyValueDTO.java
@@ -32,6 +32,6 @@ public class ApiRequestKeyValueDTO {
     }
 
     public String toString() {
-        return (enabled?"":"//")+ key + "=" + value;
+        return (enabled?"":"//")+ key + "::" + value;
     }
 }
diff --git a/src/main/java/com/eactive/httpmockserver/client/service/ApiRequestMigrationService.java b/src/main/java/com/eactive/httpmockserver/client/service/ApiRequestMigrationService.java
new file mode 100644
index 0000000..61c575c
--- /dev/null
+++ b/src/main/java/com/eactive/httpmockserver/client/service/ApiRequestMigrationService.java
@@ -0,0 +1,31 @@
+package com.eactive.httpmockserver.client.service;
+
+import com.eactive.httpmockserver.client.repository.ApiRequestRepository;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.event.ApplicationReadyEvent;
+import org.springframework.context.event.EventListener;
+import org.springframework.stereotype.Service;
+
+import javax.transaction.Transactional;
+
+
+@Service
+@Transactional
+public class ApiRequestMigrationService {
+
+    @Autowired
+    ApiRequestRepository apiRequestRepository;
+
+    @EventListener(ApplicationReadyEvent.class)
+    public void migrate() {
+        apiRequestRepository.findAll().forEach(apiRequest -> {
+
+            apiRequest.setHeaders(apiRequest.getHeaders().replaceAll("=", "::"));
+            apiRequest.setQueryParams(apiRequest.getQueryParams().replaceAll("=", "::"));
+
+            apiRequestRepository.save(apiRequest);
+        });
+
+    }
+
+}
diff --git a/src/main/java/com/eactive/httpmockserver/common/mapper/CommonMapper.java b/src/main/java/com/eactive/httpmockserver/common/mapper/CommonMapper.java
index e0146d6..13f5505 100644
--- a/src/main/java/com/eactive/httpmockserver/common/mapper/CommonMapper.java
+++ b/src/main/java/com/eactive/httpmockserver/common/mapper/CommonMapper.java
@@ -69,7 +69,7 @@ public class CommonMapper {
             } else {
                 dto.setEnabled(true);
             }
-            String[] keyValueArray = pair.split("=");
+            String[] keyValueArray = pair.split("::");
             if (keyValueArray.length == 2) {
                 dto.setKey(keyValueArray[0]);
                 dto.setValue(keyValueArray[1]);