diff --git a/lib/cartodb/models/mapconfig/adapter/vector-mapconfig-adapter.js b/lib/cartodb/models/mapconfig/adapter/vector-mapconfig-adapter.js
index 4e5020a6..14c971e9 100644
--- a/lib/cartodb/models/mapconfig/adapter/vector-mapconfig-adapter.js
+++ b/lib/cartodb/models/mapconfig/adapter/vector-mapconfig-adapter.js
@@ -18,7 +18,7 @@ class VectorMapConfigAdapter {
             return callback(null, requestMapConfig);
         }
 
-        if (requestMapConfig.layers.lenght > 1) {
+        if (requestMapConfig.layers.length > 1) {
             return callback(new Error('Get column types for multiple vector layers is not implemented'));
         }
 
@@ -43,11 +43,10 @@ class VectorMapConfigAdapter {
                 if (err) {
                     return reject(err);
                 }
-                const query = `SELECT * FROM (${originalQuery}) _cdb_column_type limit 0`;
+                const query = queryUtils.getQueryLimited(originalQuery, 0);
                 queryUtils.queryPromise(connection, query)
                     .then(resolve)
                     .catch(reject);
-                // TODO release pgConnection
             });
         });
     }
diff --git a/lib/cartodb/utils/date-wrapper.js b/lib/cartodb/utils/date-wrapper.js
index d301026d..dfbf52dd 100644
--- a/lib/cartodb/utils/date-wrapper.js
+++ b/lib/cartodb/utils/date-wrapper.js
@@ -31,7 +31,7 @@ function _isDateType(field) {
  * @param {string} column - The name of the date column
  */
 function _castColumnToEpoch(columnName) {
-    return `date_part('epoch', ${columnName}) as ${columnName}`;
+    return `date_part('epoch', ${columnName}) as "${columnName}"`;
 }
 
 module.exports = {