diff --git a/rdbms-support/src/main/java/com/homihq/db2rest/jdbc/sql/SqlCreatorTemplate.java b/rdbms-support/src/main/java/com/homihq/db2rest/jdbc/sql/SqlCreatorTemplate.java
index 8b21a2c6..ed88bdb3 100644
--- a/rdbms-support/src/main/java/com/homihq/db2rest/jdbc/sql/SqlCreatorTemplate.java
+++ b/rdbms-support/src/main/java/com/homihq/db2rest/jdbc/sql/SqlCreatorTemplate.java
@@ -42,13 +42,9 @@ public String updateQuery(UpdateContext updateContext) {
         DbTable table = updateContext.getTable();
         Dialect dialect = jdbcManager.getDialect(updateContext.getDbId());
 
-        if (dialect.supportAlias()) {
-            params.put(ROOT_TABLE, table.render());
-        } else {
-            params.put(ROOT_TABLE, table.name());
-        }
+        params.put(ROOT_TABLE, dialect.supportAlias() ? table.render() : table.name());
 
-        params.put(ROOT_TABLE, updateContext.getWhere());
+        params.put(ROOT_WHERE, updateContext.getWhere());
         params.put("columnSets", updateContext.renderSetColumns());
         params.put(ROOT_TABLE_ALIAS, table.alias());
 
diff --git a/rest-common/src/main/java/com/homihq/db2rest/bulk/CSVDataProcessor.java b/rest-common/src/main/java/com/homihq/db2rest/bulk/CSVDataProcessor.java
index f404a185..d021ea4e 100644
--- a/rest-common/src/main/java/com/homihq/db2rest/bulk/CSVDataProcessor.java
+++ b/rest-common/src/main/java/com/homihq/db2rest/bulk/CSVDataProcessor.java
@@ -51,7 +51,11 @@ public boolean handle(String contentType) {
     }
 
     private Map<String, Object> transform(Map<String, String> data) {
-        return new HashMap<>(data);
+        Map<String, Object> objectMap = new HashMap<>();
+
+        objectMap.putAll(data);
+
+        return objectMap;
     }
 
 }