diff --git a/distro/changelog.xml b/distro/changelog.xml
index 9aa1d02..2b9591f 100644
--- a/distro/changelog.xml
+++ b/distro/changelog.xml
@@ -12,7 +12,8 @@
 			uppercase names with a postgres database.
 		</Change>
 		<Change>for the getTableDetails operation column names recovered as
-			defined in their database's schema. PostgresTableStructure class modified.
+			defined in their database's schema. PostgresTableStructure class
+			modified.
 		</Change>
 		<Change>bug fixed in class ConnectionManager for the submitquery
 			operation modified in order to manage the data geometry recovering
@@ -23,7 +24,17 @@
 			operation in order to truncate column values of the result to 255
 			character.
 		</Change>
-
+		<Change>bug fixed in Sampler class in computeSmartSampleWithThreshold
+			method. table name formatted as schema."table" in order to recover
+			the rows.
+		</Change>
+		<Change>
+			bug fixed for the submitQuery and sampling operation and related to
+			column value truncated to 255 characters. If the final quote has been
+			truncated the parsecvsstring method in the servlet does not work
+			fine. Bug fixed adding the final quote. convertToJavaType method in
+			DatabaseManagement class modified.
+		</Change>
 	</Changeset>
 	<Changeset component="org.gcube.dataaccess.database-resource-manager.1-1-0"
 		date="2014-09-10">
diff --git a/src/main/java/org/gcube/dataaccess/databases/utils/DatabaseManagement.java b/src/main/java/org/gcube/dataaccess/databases/utils/DatabaseManagement.java
index 82ddcf4..4304a6a 100644
--- a/src/main/java/org/gcube/dataaccess/databases/utils/DatabaseManagement.java
+++ b/src/main/java/org/gcube/dataaccess/databases/utils/DatabaseManagement.java
@@ -201,10 +201,17 @@ public class DatabaseManagement {
 
 		}
 
-		//truncate value to 255 characters if it exceeds 255 characters
+		//to truncate value to 255 characters if it exceeds 255 characters
 		if(valConverted.length()>255){
 			valConverted = valConverted.substring(0, 255);
+//			System.out.println("val truncated: " + valConverted);
 //			System.out.println("elem geometry truncated");
+			
+			//add quote if it has been removed with truncation
+			if((valConverted.startsWith("\""))&&(!valConverted.endsWith("\""))){
+				valConverted = valConverted+"\"";
+//				System.out.println("adding quote: " + valConverted);
+			}
 		}
 		return valConverted;