diff --git a/pom.xml b/pom.xml
index d335ba3..b31164d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>kangaroo-and-rabbit</groupId>
   <artifactId>archidata</artifactId>
-  <version>0.3.5</version>
+  <version>0.3.6</version>
 	<properties>
 		<jersey.version>3.1.1</jersey.version>
 		<jaxb.version>2.3.1</jaxb.version>
diff --git a/src/org/kar/archidata/SqlWrapper.java b/src/org/kar/archidata/SqlWrapper.java
index 722335c..9bb672e 100644
--- a/src/org/kar/archidata/SqlWrapper.java
+++ b/src/org/kar/archidata/SqlWrapper.java
@@ -388,9 +388,9 @@ public class SqlWrapper {
         	String tableName = getTableName(clazz);
         	//boolean createIfNotExist = clazz.getDeclaredAnnotationsByType(SQLIfNotExists.class).length != 0;
         	StringBuilder query = new StringBuilder();
-        	query.append("INSERT INTO ");
+        	query.append("INSERT INTO `");
         	query.append(tableName);
-        	query.append(" (");
+        	query.append("` (");
 
    		 	boolean firstField = true;
    		 	int count = 0;
@@ -439,7 +439,7 @@ public class SqlWrapper {
 				query.append("?");
    		 	}
    		    query.append(")");
-   		    // logger.debug("generate the query: '{}'", query.toString());
+   		    //LOGGER.warn("generate the query: '{}'", query.toString());
             // prepare the request:
             PreparedStatement ps = entry.connection.prepareStatement(query.toString(), Statement.RETURN_GENERATED_KEYS);
             Field primaryKeyField = null;
@@ -560,9 +560,9 @@ public class SqlWrapper {
         	String tableName = getTableName(clazz);
         	//boolean createIfNotExist = clazz.getDeclaredAnnotationsByType(SQLIfNotExists.class).length != 0;
         	StringBuilder query = new StringBuilder();
-        	query.append("UPDATE ");
+        	query.append("UPDATE `");
         	query.append(tableName);
-        	query.append(" SET ");
+        	query.append("` SET ");
 
    		 	boolean firstField = true;
             Field primaryKeyField = null;
diff --git a/src/org/kar/archidata/util/JWTWrapper.java b/src/org/kar/archidata/util/JWTWrapper.java
index 83c6fcf..ea3d894 100644
--- a/src/org/kar/archidata/util/JWTWrapper.java
+++ b/src/org/kar/archidata/util/JWTWrapper.java
@@ -84,12 +84,15 @@ public class JWTWrapper {
 		try {
 			String generatedStringForKey = baseUUID;
 			if (generatedStringForKey == null) {
+				logger.error(" Generate new UUID : {}", generatedStringForKey);
 				generatedStringForKey = UUID.randomUUID().toString();
+			} else {
+				logger.error("USE UUID : {}", generatedStringForKey);
 			}
 			rsaJWK = new RSAKeyGenerator(2048).keyID(generatedStringForKey).generate();
 			rsaPublicJWK = rsaJWK.toPublicJWK();
-			//logger.debug("RSA key (all): " + rsaJWK.toJSONString());
-			//logger.debug("RSA key (pub): " + rsaPublicJWK.toJSONString());
+			logger.error("RSA key (all): " + rsaJWK.toJSONString());
+			logger.error("RSA key (pub): " + rsaPublicJWK.toJSONString());
 		} catch (JOSEException e) {
 			// TODO Auto-generated catch block
 			e.printStackTrace();