diff --git a/CHANGES_NEXT_RELEASE b/CHANGES_NEXT_RELEASE
index 7e7d46ca9..9fa5ef352 100644
--- a/CHANGES_NEXT_RELEASE
+++ b/CHANGES_NEXT_RELEASE
@@ -1,3 +1,4 @@
+- [cygnus-common] [Arcgis] fix url quoted based on uniqueFieldType (#2311)
 - [cygnus-common] [SQL] Add Primary Key on Timestamp to Error Log table (#2302)
 - [cygnus-common] Upgrade gson dependency from 2.6.2 to 2.10.1
 - [cygnus-common] Upgrade mysql-java-connector dependency from 8.0.28 to 8.0.33
diff --git a/cygnus-common/src/main/java/com/telefonica/iot/cygnus/backends/arcgis/restutils/ArcgisFeatureTable.java b/cygnus-common/src/main/java/com/telefonica/iot/cygnus/backends/arcgis/restutils/ArcgisFeatureTable.java
index 161ace8b3..796f14e2f 100644
--- a/cygnus-common/src/main/java/com/telefonica/iot/cygnus/backends/arcgis/restutils/ArcgisFeatureTable.java
+++ b/cygnus-common/src/main/java/com/telefonica/iot/cygnus/backends/arcgis/restutils/ArcgisFeatureTable.java
@@ -345,9 +345,9 @@ protected String getUniqueFieldList(List<Feature> featureArray, String uniqueFie
         // Checks if field exists in table, an retrieves it's type
         if (hasAttribute(uniqueField)) {
             String uniqueFieldType = getAttributeType(uniqueField);
-            quoted = GisAttributeType.DATE.equals(uniqueFieldType)
-                    || GisAttributeType.STRING.equals(uniqueFieldType);
-
+            quoted = GisAttributeType.DATE.toString().equalsIgnoreCase(uniqueFieldType)
+                || GisAttributeType.STRING.toString().equalsIgnoreCase(uniqueFieldType);
+            LOGGER.debug("uniqueField: " + uniqueField +  " uniqueFieldType " + uniqueFieldType + " in table");
             // Make the list
             for (Feature feature : featureArray) {
                 if (feature.getAttributes().containsKey(uniqueField)) {
diff --git a/cygnus-common/src/main/java/com/telefonica/iot/cygnus/backends/arcgis/restutils/RestApi.java b/cygnus-common/src/main/java/com/telefonica/iot/cygnus/backends/arcgis/restutils/RestApi.java
index 0bf1b309a..188bde3db 100644
--- a/cygnus-common/src/main/java/com/telefonica/iot/cygnus/backends/arcgis/restutils/RestApi.java
+++ b/cygnus-common/src/main/java/com/telefonica/iot/cygnus/backends/arcgis/restutils/RestApi.java
@@ -176,7 +176,9 @@ public static HttpResponse requestHTTP(String urlToRead, Map<String, String> par
 
         try {
             String strUrl = fullUrl(urlToRead, params);
-            LOGGER.debug("requesting HTTP: " + strUrl);
+            LOGGER.debug("requesting HTTP: " + strUrl +
+                         "---METHOD: " + httpMethod.toString() +
+                         "---BODY: " + body);
 
             // Create a trust manager that does not validate certificate chains
             TrustManager[] trustAllCerts = new TrustManager[] {new X509TrustManager() {