diff --git a/TASMAN-core/src/main/java/it/inaf/ia2/tsm/datalayer/DBBrokerTemplate.java b/TASMAN-core/src/main/java/it/inaf/ia2/tsm/datalayer/DBBrokerTemplate.java
index b6ee032453082f4299f40f7ff1f286fbda3a74b0..242c04b2fde51718c2c740cfc2f63560a0966b39 100644
--- a/TASMAN-core/src/main/java/it/inaf/ia2/tsm/datalayer/DBBrokerTemplate.java
+++ b/TASMAN-core/src/main/java/it/inaf/ia2/tsm/datalayer/DBBrokerTemplate.java
@@ -917,12 +917,12 @@ public abstract class DBBrokerTemplate implements DBBroker {
         StringBuilder sb = new StringBuilder();
         sb.append("SELECT k.key_id AS key_id\n");
         sb.append("FROM ");
-        sb.append(tapSchemaName);
+        sb.append(escape(tapSchemaName));
         sb.append(".");
         sb.append(escape("keys"));
         sb.append(" k\n");
         sb.append("JOIN ");
-        sb.append(tapSchemaName);
+        sb.append(escape(tapSchemaName));
         sb.append(".key_columns c ON k.key_id = c.key_id\n");
         sb.append("WHERE (k.from_table = ? AND c.from_column = ?) OR (k.target_table = ? AND c.target_column = ?)");
 
diff --git a/TASMAN-webapp/src/main/java/it/inaf/ia2/tsm/webapp/TapSchemaEditingBean.java b/TASMAN-webapp/src/main/java/it/inaf/ia2/tsm/webapp/TapSchemaEditingBean.java
index 82f4940ec819557bb243e7fec346d8a205033e05..7bfecb8065fbb58bbea0866e2631cf111c631edb 100644
--- a/TASMAN-webapp/src/main/java/it/inaf/ia2/tsm/webapp/TapSchemaEditingBean.java
+++ b/TASMAN-webapp/src/main/java/it/inaf/ia2/tsm/webapp/TapSchemaEditingBean.java
@@ -427,7 +427,7 @@ public class TapSchemaEditingBean implements Serializable {
         if (!parentSchemaRemovable) {
             return !column.isMandatory();
         }
-        return true;
+        return column.getStatus() != Status.TO_REMOVE && column.getStatus() != Status.REMOVED_NOT_PERSISTED;
     }
 
     public boolean isHasColumnsSorter() {