diff --git a/app/models/formats/ogr.js b/app/models/formats/ogr.js
index 29d0a7c18..22a2363d3 100644
--- a/app/models/formats/ogr.js
+++ b/app/models/formats/ogr.js
@@ -32,12 +32,12 @@ OgrFormat.prototype = {
   getFileExtension: function(){ return this._fileExtension; },
 
   getKey: function(options) {
-    return [this.id,
+    return this.generateMD5([this.id,
         options.dbopts.dbname,
         options.dbopts.user,
         options.gn,
-        this.generateMD5(options.filename),
-        this.generateMD5(options.sql)].concat(options.skipfields).join(':');
+        options.filename,
+        options.sql].concat(options.skipfields).join(':'));
   },
 
   generateMD5: function (data){
@@ -219,14 +219,14 @@ OgrFormat.prototype.toOGR_SingleFile = function(options, fmt, callback) {
   var layername = options.filename;
 
   var tmpdir = global.settings.tmpDir || '/tmp';
-  var reqKey = [
+  var reqKey = this.generateMD5([
       fmt,
       dbname,
       user_id,
       gcol,
-      this.generateMD5(layername),
-      this.generateMD5(sql)
-  ].concat(skipfields).join(':');
+      layername,
+      sql
+  ].concat(skipfields).join(':'));
   var outdirpath = tmpdir + '/sqlapi-' + process.pid + '-' + reqKey;
   var dumpfile = outdirpath + ':cartodb-query.' + ext;
 
diff --git a/app/models/formats/ogr/shp.js b/app/models/formats/ogr/shp.js
index 4dd59f354..d38e5a242 100644
--- a/app/models/formats/ogr/shp.js
+++ b/app/models/formats/ogr/shp.js
@@ -35,7 +35,7 @@ ShpFormat.prototype.toSHP = function (options, callback) {
   var fmtObj = this;
   var zip = 'zip'; // FIXME: make configurable
   var tmpdir = global.settings.tmpDir || '/tmp';
-  var reqKey = [ 'shp', dbname, user_id, gcol, this.generateMD5(sql) ].concat(skipfields).join(':');
+  var reqKey = this.generateMD5([ 'shp', dbname, user_id, gcol, sql ].concat(skipfields).join(':'));
   var outdirpath = tmpdir + '/sqlapi-' + process.pid + '-' + reqKey; 
   var zipfile = outdirpath + '.zip';
   var shapefile = outdirpath + '/' + filename + '.shp';