diff --git a/NEWS.md b/NEWS.md
index dd79c783..c389ba24 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -16,6 +16,7 @@ New features
 
 Bug Fixes:
 - Prevent from uncaught exception: Range filter Error from camshaft when getting analysis query.
+- Make all modules to use strict mode semantics.
 
 ## 6.4.0
 Released 2018-09-24
diff --git a/app.js b/app.js
index f35d580e..bb7928fa 100755
--- a/app.js
+++ b/app.js
@@ -1,3 +1,5 @@
+'use strict';
+
 var http = require('http');
 var https = require('https');
 var path = require('path');
diff --git a/lib/cartodb/api/api-router.js b/lib/cartodb/api/api-router.js
index 6083ab0c..fafc90b3 100644
--- a/lib/cartodb/api/api-router.js
+++ b/lib/cartodb/api/api-router.js
@@ -1,3 +1,5 @@
+'use strict';
+
 const { Router: router } = require('express');
 
 const RedisPool = require('redis-mpool');
diff --git a/lib/cartodb/api/map/analyses-catalog-controller.js b/lib/cartodb/api/map/analyses-catalog-controller.js
index 2fae5ac2..f7f66346 100644
--- a/lib/cartodb/api/map/analyses-catalog-controller.js
+++ b/lib/cartodb/api/map/analyses-catalog-controller.js
@@ -1,3 +1,5 @@
+'use strict';
+
 const PSQL = require('cartodb-psql');
 const cleanUpQueryParams = require('../middlewares/clean-up-query-params');
 const credentials = require('../middlewares/credentials');
diff --git a/lib/cartodb/api/map/analysis-layergroup-controller.js b/lib/cartodb/api/map/analysis-layergroup-controller.js
index 41acf819..0375d9ed 100644
--- a/lib/cartodb/api/map/analysis-layergroup-controller.js
+++ b/lib/cartodb/api/map/analysis-layergroup-controller.js
@@ -1,3 +1,5 @@
+'use strict';
+
 const layergroupToken = require('../middlewares/layergroup-token');
 const cleanUpQueryParams = require('../middlewares/clean-up-query-params');
 const credentials = require('../middlewares/credentials');
diff --git a/lib/cartodb/api/map/anonymous-map-controller.js b/lib/cartodb/api/map/anonymous-map-controller.js
index 656d9787..ef47f5b6 100644
--- a/lib/cartodb/api/map/anonymous-map-controller.js
+++ b/lib/cartodb/api/map/anonymous-map-controller.js
@@ -1,3 +1,5 @@
+'use strict';
+
 const windshaft = require('windshaft');
 const MapConfig = windshaft.model.MapConfig;
 const Datasource = windshaft.model.Datasource;
@@ -152,17 +154,17 @@ function prepareAdapterMapConfig (mapConfigAdapter) {
             }
         };
 
-        mapConfigAdapter.getMapConfig(user, 
-                                      requestMapConfig, 
-                                      params, 
-                                      context, 
+        mapConfigAdapter.getMapConfig(user,
+                                      requestMapConfig,
+                                      params,
+                                      context,
                                       (err, requestMapConfig, stats = { overviewsAddedToMapconfig : false }) => {
             req.profiler.done('anonymous.getMapConfig');
-            
+
             stats.mapType = 'anonymous';
             req.profiler.add(stats);
 
-                      
+
             if (err) {
                 return next(err);
             }
diff --git a/lib/cartodb/api/map/attributes-layergroup-controller.js b/lib/cartodb/api/map/attributes-layergroup-controller.js
index 2723ebd0..9ab394d7 100644
--- a/lib/cartodb/api/map/attributes-layergroup-controller.js
+++ b/lib/cartodb/api/map/attributes-layergroup-controller.js
@@ -1,3 +1,5 @@
+'use strict';
+
 const layergroupToken = require('../middlewares/layergroup-token');
 const cleanUpQueryParams = require('../middlewares/clean-up-query-params');
 const credentials = require('../middlewares/credentials');
diff --git a/lib/cartodb/api/map/dataview-layergroup-controller.js b/lib/cartodb/api/map/dataview-layergroup-controller.js
index 5fd666ea..d82556b8 100644
--- a/lib/cartodb/api/map/dataview-layergroup-controller.js
+++ b/lib/cartodb/api/map/dataview-layergroup-controller.js
@@ -1,3 +1,5 @@
+'use strict';
+
 const layergroupToken = require('../middlewares/layergroup-token');
 const cleanUpQueryParams = require('../middlewares/clean-up-query-params');
 const credentials = require('../middlewares/credentials');
diff --git a/lib/cartodb/api/map/map-router.js b/lib/cartodb/api/map/map-router.js
index 46e2be5e..dac55670 100644
--- a/lib/cartodb/api/map/map-router.js
+++ b/lib/cartodb/api/map/map-router.js
@@ -1,3 +1,5 @@
+'use strict';
+
 const { Router: router } = require('express');
 
 const AnalysisLayergroupController = require('./analysis-layergroup-controller');
diff --git a/lib/cartodb/api/map/preview-layergroup-controller.js b/lib/cartodb/api/map/preview-layergroup-controller.js
index 975d3f56..bf516f5e 100644
--- a/lib/cartodb/api/map/preview-layergroup-controller.js
+++ b/lib/cartodb/api/map/preview-layergroup-controller.js
@@ -1,3 +1,5 @@
+'use strict';
+
 const layergroupToken = require('../middlewares/layergroup-token');
 const coordinates = require('../middlewares/coordinates');
 const cleanUpQueryParams = require('../middlewares/clean-up-query-params');
diff --git a/lib/cartodb/api/map/preview-template-controller.js b/lib/cartodb/api/map/preview-template-controller.js
index 321bb882..eea382de 100644
--- a/lib/cartodb/api/map/preview-template-controller.js
+++ b/lib/cartodb/api/map/preview-template-controller.js
@@ -1,3 +1,5 @@
+'use strict';
+
 const cleanUpQueryParams = require('../middlewares/clean-up-query-params');
 const credentials = require('../middlewares/credentials');
 const dbConnSetup = require('../middlewares/db-conn-setup');
diff --git a/lib/cartodb/api/map/tile-layergroup-controller.js b/lib/cartodb/api/map/tile-layergroup-controller.js
index 477ae444..422fa8b6 100644
--- a/lib/cartodb/api/map/tile-layergroup-controller.js
+++ b/lib/cartodb/api/map/tile-layergroup-controller.js
@@ -1,3 +1,5 @@
+'use strict';
+
 const layergroupToken = require('../middlewares/layergroup-token');
 const coordinates = require('../middlewares/coordinates');
 const cleanUpQueryParams = require('../middlewares/clean-up-query-params');
diff --git a/lib/cartodb/api/middlewares/augment-layergroup-data.js b/lib/cartodb/api/middlewares/augment-layergroup-data.js
index 65a6702d..d58e2fb2 100644
--- a/lib/cartodb/api/middlewares/augment-layergroup-data.js
+++ b/lib/cartodb/api/middlewares/augment-layergroup-data.js
@@ -1,3 +1,5 @@
+'use strict';
+
 const _ = require('underscore');
 
 module.exports = function augmentLayergroupData () {
diff --git a/lib/cartodb/api/middlewares/authorize.js b/lib/cartodb/api/middlewares/authorize.js
index 54cab1c4..619f1f74 100644
--- a/lib/cartodb/api/middlewares/authorize.js
+++ b/lib/cartodb/api/middlewares/authorize.js
@@ -1,3 +1,5 @@
+'use strict';
+
 module.exports = function authorize (authBackend) {
     return function authorizeMiddleware (req, res, next) {
         authBackend.authorize(req, res, (err, authorized) => {
diff --git a/lib/cartodb/api/middlewares/cache-channel-header.js b/lib/cartodb/api/middlewares/cache-channel-header.js
index d6bf394b..03b3d2e1 100644
--- a/lib/cartodb/api/middlewares/cache-channel-header.js
+++ b/lib/cartodb/api/middlewares/cache-channel-header.js
@@ -1,3 +1,5 @@
+'use strict';
+
 module.exports = function setCacheChannelHeader () {
     return function setCacheChannelHeaderMiddleware (req, res, next) {
         if (req.method !== 'GET') {
diff --git a/lib/cartodb/api/middlewares/cache-control-header.js b/lib/cartodb/api/middlewares/cache-control-header.js
index 574ae3b5..d72ee0c3 100644
--- a/lib/cartodb/api/middlewares/cache-control-header.js
+++ b/lib/cartodb/api/middlewares/cache-control-header.js
@@ -1,3 +1,5 @@
+'use strict';
+
 const ONE_YEAR_IN_SECONDS = 60 * 60 * 24 * 365;
 
 module.exports = function setCacheControlHeader ({ ttl = ONE_YEAR_IN_SECONDS, revalidate = false } = {}) {
diff --git a/lib/cartodb/api/middlewares/check-json-content-type.js b/lib/cartodb/api/middlewares/check-json-content-type.js
index 05aa6f26..6f02c750 100644
--- a/lib/cartodb/api/middlewares/check-json-content-type.js
+++ b/lib/cartodb/api/middlewares/check-json-content-type.js
@@ -1,3 +1,5 @@
+'use strict';
+
 module.exports = function checkJsonContentType () {
     return function checkJsonContentTypeMiddleware(req, res, next) {
         if (req.method === 'POST' && !req.is('application/json')) {
diff --git a/lib/cartodb/api/middlewares/check-static-image-format.js b/lib/cartodb/api/middlewares/check-static-image-format.js
index 9b9c8b24..411240db 100644
--- a/lib/cartodb/api/middlewares/check-static-image-format.js
+++ b/lib/cartodb/api/middlewares/check-static-image-format.js
@@ -1,3 +1,5 @@
+'use strict';
+
 const VALID_IMAGE_FORMATS = ['png', 'jpg'];
 
 module.exports = function checkStaticImageFormat () {
diff --git a/lib/cartodb/api/middlewares/clean-up-query-params.js b/lib/cartodb/api/middlewares/clean-up-query-params.js
index 768b35f2..898b5358 100644
--- a/lib/cartodb/api/middlewares/clean-up-query-params.js
+++ b/lib/cartodb/api/middlewares/clean-up-query-params.js
@@ -1,3 +1,5 @@
+'use strict';
+
 const _ = require('underscore');
 
 // Whitelist query parameters and attach format
diff --git a/lib/cartodb/api/middlewares/coordinates.js b/lib/cartodb/api/middlewares/coordinates.js
index d0840393..5c48439c 100644
--- a/lib/cartodb/api/middlewares/coordinates.js
+++ b/lib/cartodb/api/middlewares/coordinates.js
@@ -1,3 +1,5 @@
+'use strict';
+
 const positiveIntegerNumberRegExp = /^\d+$/;
 const integerNumberRegExp = /^-?\d+$/;
 const invalidZoomMessage = function (zoom) {
diff --git a/lib/cartodb/api/middlewares/cors.js b/lib/cartodb/api/middlewares/cors.js
index 12db26ac..34b06bf5 100644
--- a/lib/cartodb/api/middlewares/cors.js
+++ b/lib/cartodb/api/middlewares/cors.js
@@ -1,3 +1,5 @@
+'use strict';
+
 module.exports = function cors () {
     return function corsMiddleware (req, res, next) {
         const headers = [
diff --git a/lib/cartodb/api/middlewares/credentials.js b/lib/cartodb/api/middlewares/credentials.js
index b202de47..71316f4b 100644
--- a/lib/cartodb/api/middlewares/credentials.js
+++ b/lib/cartodb/api/middlewares/credentials.js
@@ -1,3 +1,5 @@
+'use strict';
+
 const basicAuth = require('basic-auth');
 
 module.exports = function credentials () {
diff --git a/lib/cartodb/api/middlewares/db-conn-setup.js b/lib/cartodb/api/middlewares/db-conn-setup.js
index ce3f6ac0..0ab4d105 100644
--- a/lib/cartodb/api/middlewares/db-conn-setup.js
+++ b/lib/cartodb/api/middlewares/db-conn-setup.js
@@ -1,3 +1,5 @@
+'use strict';
+
 const _ = require('underscore');
 
 module.exports = function dbConnSetup (pgConnection) {
diff --git a/lib/cartodb/api/middlewares/error-middleware.js b/lib/cartodb/api/middlewares/error-middleware.js
index c1533b43..a81c87a0 100644
--- a/lib/cartodb/api/middlewares/error-middleware.js
+++ b/lib/cartodb/api/middlewares/error-middleware.js
@@ -1,3 +1,5 @@
+'use strict';
+
 const _ = require('underscore');
 const debug = require('debug')('windshaft:cartodb:error-middleware');
 
diff --git a/lib/cartodb/api/middlewares/increment-map-view-count.js b/lib/cartodb/api/middlewares/increment-map-view-count.js
index acf241fd..6afb8c76 100644
--- a/lib/cartodb/api/middlewares/increment-map-view-count.js
+++ b/lib/cartodb/api/middlewares/increment-map-view-count.js
@@ -1,3 +1,5 @@
+'use strict';
+
 module.exports = function incrementMapViewCount (metadataBackend) {
     return function incrementMapViewCountMiddleware(req, res, next) {
         const { mapConfig, user } = res.locals;
diff --git a/lib/cartodb/api/middlewares/init-profiler.js b/lib/cartodb/api/middlewares/init-profiler.js
index 6d0be211..86916822 100644
--- a/lib/cartodb/api/middlewares/init-profiler.js
+++ b/lib/cartodb/api/middlewares/init-profiler.js
@@ -1,3 +1,5 @@
+'use strict';
+
 module.exports = function initProfiler (isTemplateInstantiation) {
     const operation = isTemplateInstantiation ? 'instance_template' : 'createmap';
 
diff --git a/lib/cartodb/api/middlewares/initialize-status-code.js b/lib/cartodb/api/middlewares/initialize-status-code.js
index ed6b1805..db35bb51 100644
--- a/lib/cartodb/api/middlewares/initialize-status-code.js
+++ b/lib/cartodb/api/middlewares/initialize-status-code.js
@@ -1,3 +1,5 @@
+'use strict';
+
 module.exports = function initializeStatusCode () {
     return function initializeStatusCodeMiddleware (req, res, next) {
         if (req.method !== 'OPTIONS') {
diff --git a/lib/cartodb/api/middlewares/last-modified-header.js b/lib/cartodb/api/middlewares/last-modified-header.js
index d1fcee47..3f6c6e6a 100644
--- a/lib/cartodb/api/middlewares/last-modified-header.js
+++ b/lib/cartodb/api/middlewares/last-modified-header.js
@@ -1,3 +1,5 @@
+'use strict';
+
 module.exports = function setLastModifiedHeader () {
     return function setLastModifiedHeaderMiddleware(req, res, next) {
         if (req.method !== 'GET') {
diff --git a/lib/cartodb/api/middlewares/last-updated-time-layergroup.js b/lib/cartodb/api/middlewares/last-updated-time-layergroup.js
index f883fc35..d0520316 100644
--- a/lib/cartodb/api/middlewares/last-updated-time-layergroup.js
+++ b/lib/cartodb/api/middlewares/last-updated-time-layergroup.js
@@ -1,3 +1,5 @@
+'use strict';
+
 module.exports = function setLastUpdatedTimeToLayergroup () {
     return function setLastUpdatedTimeToLayergroupMiddleware (req, res, next) {
         const { mapConfigProvider, analysesResults } = res.locals;
diff --git a/lib/cartodb/api/middlewares/layer-stats.js b/lib/cartodb/api/middlewares/layer-stats.js
index e6ca00e6..2df472f7 100644
--- a/lib/cartodb/api/middlewares/layer-stats.js
+++ b/lib/cartodb/api/middlewares/layer-stats.js
@@ -1,3 +1,5 @@
+'use strict';
+
 module.exports = function setLayerStats (pgConnection, statsBackend) {
     return function setLayerStatsMiddleware(req, res, next) {
         const { user, mapConfig } = res.locals;
diff --git a/lib/cartodb/api/middlewares/layergroup-id-header.js b/lib/cartodb/api/middlewares/layergroup-id-header.js
index 8141d6a6..94470972 100644
--- a/lib/cartodb/api/middlewares/layergroup-id-header.js
+++ b/lib/cartodb/api/middlewares/layergroup-id-header.js
@@ -1,3 +1,5 @@
+'use strict';
+
 module.exports = function setLayergroupIdHeader (templateMaps, useTemplateHash) {
     return function setLayergroupIdHeaderMiddleware (req, res, next) {
         const { user, template } = res.locals;
diff --git a/lib/cartodb/api/middlewares/layergroup-metadata.js b/lib/cartodb/api/middlewares/layergroup-metadata.js
index a9cec443..ae1fddba 100644
--- a/lib/cartodb/api/middlewares/layergroup-metadata.js
+++ b/lib/cartodb/api/middlewares/layergroup-metadata.js
@@ -1,3 +1,5 @@
+'use strict';
+
 module.exports = function setMetadataToLayergroup (layergroupMetadata, includeQuery) {
     return function setMetadataToLayergroupMiddleware (req, res, next) {
         const { user, mapConfig, analysesResults = [], context, api_key: userApiKey } = res.locals;
diff --git a/lib/cartodb/api/middlewares/layergroup-token.js b/lib/cartodb/api/middlewares/layergroup-token.js
index 0e6553d2..fcc6959b 100644
--- a/lib/cartodb/api/middlewares/layergroup-token.js
+++ b/lib/cartodb/api/middlewares/layergroup-token.js
@@ -1,3 +1,5 @@
+'use strict';
+
 const LayergroupToken = require('../../models/layergroup-token');
 const authErrorMessageTemplate = function (signer, user) {
     return `Cannot use map signature of user "${signer}" on db of user "${user}"`;
diff --git a/lib/cartodb/api/middlewares/logger.js b/lib/cartodb/api/middlewares/logger.js
index ccd51d45..da198d64 100644
--- a/lib/cartodb/api/middlewares/logger.js
+++ b/lib/cartodb/api/middlewares/logger.js
@@ -1,3 +1,5 @@
+'use strict';
+
 module.exports = function logger (options) {
     if (!global.log4js || !options.log_format) {
         return function dummyLoggerMiddleware (req, res, next) {
diff --git a/lib/cartodb/api/middlewares/lzma.js b/lib/cartodb/api/middlewares/lzma.js
index b0a94412..dee7ee61 100644
--- a/lib/cartodb/api/middlewares/lzma.js
+++ b/lib/cartodb/api/middlewares/lzma.js
@@ -1,3 +1,5 @@
+'use strict';
+
 const LZMA = require('lzma').LZMA;
 
 module.exports = function lzma () {
diff --git a/lib/cartodb/api/middlewares/map-error.js b/lib/cartodb/api/middlewares/map-error.js
index 6d87a93d..7c0ec278 100644
--- a/lib/cartodb/api/middlewares/map-error.js
+++ b/lib/cartodb/api/middlewares/map-error.js
@@ -1,3 +1,5 @@
+'use strict';
+
 module.exports = function mapError (options) {
     const { addContext = false, label = 'MAPS CONTROLLER' } = options;
 
diff --git a/lib/cartodb/api/middlewares/map-store-map-config-provider.js b/lib/cartodb/api/middlewares/map-store-map-config-provider.js
index a5b4b1f6..37c624c5 100644
--- a/lib/cartodb/api/middlewares/map-store-map-config-provider.js
+++ b/lib/cartodb/api/middlewares/map-store-map-config-provider.js
@@ -1,3 +1,5 @@
+'use strict';
+
 const MapStoreMapConfigProvider = require('../../models/mapconfig/provider/map-store-provider');
 
 module.exports = function createMapStoreMapConfigProvider (
diff --git a/lib/cartodb/api/middlewares/named-map-provider.js b/lib/cartodb/api/middlewares/named-map-provider.js
index 08f0cad5..9134dd29 100644
--- a/lib/cartodb/api/middlewares/named-map-provider.js
+++ b/lib/cartodb/api/middlewares/named-map-provider.js
@@ -1,3 +1,5 @@
+'use strict';
+
 module.exports = function getNamedMapProvider ({ namedMapProviderCache, label, forcedFormat = null }) {
     return function getNamedMapProviderMiddleware (req, res, next) {
         const { user, token, cache_buster, api_key } = res.locals;
diff --git a/lib/cartodb/api/middlewares/noop.js b/lib/cartodb/api/middlewares/noop.js
index 16ceabbe..9cfa684b 100644
--- a/lib/cartodb/api/middlewares/noop.js
+++ b/lib/cartodb/api/middlewares/noop.js
@@ -1,3 +1,5 @@
+'use strict';
+
 module.exports = function noop () {
     return function noopMiddleware (req, res, next) {
         next();
diff --git a/lib/cartodb/api/middlewares/send-response.js b/lib/cartodb/api/middlewares/send-response.js
index ec13c5bf..3e858aff 100644
--- a/lib/cartodb/api/middlewares/send-response.js
+++ b/lib/cartodb/api/middlewares/send-response.js
@@ -1,3 +1,5 @@
+'use strict';
+
 module.exports = function sendResponse () {
     return function sendResponseMiddleware (req, res) {
         req.profiler.done('res');
diff --git a/lib/cartodb/api/middlewares/served-by-host-header.js b/lib/cartodb/api/middlewares/served-by-host-header.js
index 809100a2..297cc945 100644
--- a/lib/cartodb/api/middlewares/served-by-host-header.js
+++ b/lib/cartodb/api/middlewares/served-by-host-header.js
@@ -1,3 +1,5 @@
+'use strict';
+
 const os = require('os');
 
 module.exports = function servedByHostHeader () {
diff --git a/lib/cartodb/api/middlewares/stats.js b/lib/cartodb/api/middlewares/stats.js
index 53d2cf9a..51dbdf53 100644
--- a/lib/cartodb/api/middlewares/stats.js
+++ b/lib/cartodb/api/middlewares/stats.js
@@ -1,3 +1,5 @@
+'use strict';
+
 const Profiler = require('../../stats/profiler_proxy');
 const debug = require('debug')('windshaft:cartodb:stats');
 const onHeaders = require('on-headers');
diff --git a/lib/cartodb/api/middlewares/surrogate-key-header.js b/lib/cartodb/api/middlewares/surrogate-key-header.js
index d2a3243c..f616b009 100644
--- a/lib/cartodb/api/middlewares/surrogate-key-header.js
+++ b/lib/cartodb/api/middlewares/surrogate-key-header.js
@@ -1,3 +1,5 @@
+'use strict';
+
 const NamedMapsCacheEntry = require('../../cache/model/named_maps_entry');
 const NamedMapMapConfigProvider = require('../../models/mapconfig/provider/named-map-provider');
 
diff --git a/lib/cartodb/api/middlewares/syntax-error.js b/lib/cartodb/api/middlewares/syntax-error.js
index ad4df4e8..c293cef3 100644
--- a/lib/cartodb/api/middlewares/syntax-error.js
+++ b/lib/cartodb/api/middlewares/syntax-error.js
@@ -1,3 +1,5 @@
+'use strict';
+
 module.exports = function syntaxError () {
     return function syntaxErrorMiddleware (err, req, res, next) {
         if (err.name === 'SyntaxError') {
diff --git a/lib/cartodb/api/middlewares/user.js b/lib/cartodb/api/middlewares/user.js
index 551fa001..4dda75e7 100644
--- a/lib/cartodb/api/middlewares/user.js
+++ b/lib/cartodb/api/middlewares/user.js
@@ -1,3 +1,5 @@
+'use strict';
+
 const CdbRequest = require('../../models/cdb_request');
 
 module.exports = function user () {
diff --git a/lib/cartodb/api/middlewares/vector-error.js b/lib/cartodb/api/middlewares/vector-error.js
index 7e2ec75f..4de1ebce 100644
--- a/lib/cartodb/api/middlewares/vector-error.js
+++ b/lib/cartodb/api/middlewares/vector-error.js
@@ -1,3 +1,5 @@
+'use strict';
+
 const fs = require('fs');
 const timeoutErrorVectorTile = fs.readFileSync(__dirname + '/../../../../assets/render-timeout-fallback.mvt');
 
diff --git a/lib/cartodb/api/template/admin-template-controller.js b/lib/cartodb/api/template/admin-template-controller.js
index 4a727d23..c8d2ba97 100644
--- a/lib/cartodb/api/template/admin-template-controller.js
+++ b/lib/cartodb/api/template/admin-template-controller.js
@@ -1,3 +1,5 @@
+'use strict';
+
 const { templateName } = require('../../backends/template_maps');
 const credentials = require('../middlewares/credentials');
 const rateLimit = require('../middlewares/rate-limit');
diff --git a/lib/cartodb/api/template/named-template-controller.js b/lib/cartodb/api/template/named-template-controller.js
index 0408ed3a..b28143dd 100644
--- a/lib/cartodb/api/template/named-template-controller.js
+++ b/lib/cartodb/api/template/named-template-controller.js
@@ -1,3 +1,5 @@
+'use strict';
+
 const cleanUpQueryParams = require('../middlewares/clean-up-query-params');
 const credentials = require('../middlewares/credentials');
 const dbConnSetup = require('../middlewares/db-conn-setup');
diff --git a/lib/cartodb/api/template/template-router.js b/lib/cartodb/api/template/template-router.js
index 4234bb22..0299679d 100644
--- a/lib/cartodb/api/template/template-router.js
+++ b/lib/cartodb/api/template/template-router.js
@@ -1,3 +1,5 @@
+'use strict';
+
 const { Router: router } = require('express');
 
 const NamedMapController = require('./named-template-controller');
diff --git a/lib/cartodb/api/template/tile-template-controller.js b/lib/cartodb/api/template/tile-template-controller.js
index 71a45e6e..daf751e6 100644
--- a/lib/cartodb/api/template/tile-template-controller.js
+++ b/lib/cartodb/api/template/tile-template-controller.js
@@ -1,3 +1,5 @@
+'use strict';
+
 const coordinates = require('../middlewares/coordinates');
 const cleanUpQueryParams = require('../middlewares/clean-up-query-params');
 const credentials = require('../middlewares/credentials');
diff --git a/lib/cartodb/backends/analysis-status.js b/lib/cartodb/backends/analysis-status.js
index 0060f36b..1c636f4e 100644
--- a/lib/cartodb/backends/analysis-status.js
+++ b/lib/cartodb/backends/analysis-status.js
@@ -1,3 +1,5 @@
+'use strict';
+
 var PSQL = require('cartodb-psql');
 
 function AnalysisStatusBackend() {
diff --git a/lib/cartodb/backends/auth.js b/lib/cartodb/backends/auth.js
index 879a1a18..0a17e4a2 100644
--- a/lib/cartodb/backends/auth.js
+++ b/lib/cartodb/backends/auth.js
@@ -1,3 +1,5 @@
+'use strict';
+
 /**
  *
  * @param {PgConnection} pgConnection
diff --git a/lib/cartodb/backends/dataview.js b/lib/cartodb/backends/dataview.js
index 99a115e6..acdf24a7 100644
--- a/lib/cartodb/backends/dataview.js
+++ b/lib/cartodb/backends/dataview.js
@@ -1,3 +1,5 @@
+'use strict';
+
 var _ = require('underscore');
 var PSQL = require('cartodb-psql');
 var BBoxFilter = require('../models/filter/bbox');
diff --git a/lib/cartodb/backends/filter-stats.js b/lib/cartodb/backends/filter-stats.js
index b37d8704..c5fb48bb 100644
--- a/lib/cartodb/backends/filter-stats.js
+++ b/lib/cartodb/backends/filter-stats.js
@@ -1,3 +1,5 @@
+'use strict';
+
 var _ = require('underscore');
 var AnalysisFilter = require('../models/filter/analysis');
 
diff --git a/lib/cartodb/backends/layer-stats/empty-layer-stats.js b/lib/cartodb/backends/layer-stats/empty-layer-stats.js
index 0760c0b6..72c76e84 100644
--- a/lib/cartodb/backends/layer-stats/empty-layer-stats.js
+++ b/lib/cartodb/backends/layer-stats/empty-layer-stats.js
@@ -1,3 +1,5 @@
+'use strict';
+
 function EmptyLayerStats(types) {
     this._types = types || {};
 }
diff --git a/lib/cartodb/backends/layer-stats/factory.js b/lib/cartodb/backends/layer-stats/factory.js
index 8aacdb5a..19eb0701 100644
--- a/lib/cartodb/backends/layer-stats/factory.js
+++ b/lib/cartodb/backends/layer-stats/factory.js
@@ -1,3 +1,5 @@
+'use strict';
+
 var LayerStats = require('./layer-stats');
 var EmptyLayerStats = require('./empty-layer-stats');
 var MapnikLayerStats = require('./mapnik-layer-stats');
diff --git a/lib/cartodb/backends/layer-stats/layer-stats.js b/lib/cartodb/backends/layer-stats/layer-stats.js
index 2464fb22..38e9b461 100644
--- a/lib/cartodb/backends/layer-stats/layer-stats.js
+++ b/lib/cartodb/backends/layer-stats/layer-stats.js
@@ -1,3 +1,5 @@
+'use strict';
+
 var queue = require('queue-async');
 
 function LayerStats(layerStatsIterator) {
diff --git a/lib/cartodb/backends/layer-stats/mapnik-layer-stats.js b/lib/cartodb/backends/layer-stats/mapnik-layer-stats.js
index 4de960fe..a8a181cc 100644
--- a/lib/cartodb/backends/layer-stats/mapnik-layer-stats.js
+++ b/lib/cartodb/backends/layer-stats/mapnik-layer-stats.js
@@ -1,3 +1,5 @@
+'use strict';
+
 const queryUtils = require('../../utils/query-utils');
 const AggregationMapConfig = require('../../models/aggregation/aggregation-mapconfig');
 const aggregationQuery = require('../../models/aggregation/aggregation-query');
diff --git a/lib/cartodb/backends/layer-stats/torque-layer-stats.js b/lib/cartodb/backends/layer-stats/torque-layer-stats.js
index 00b4def2..af198b1e 100644
--- a/lib/cartodb/backends/layer-stats/torque-layer-stats.js
+++ b/lib/cartodb/backends/layer-stats/torque-layer-stats.js
@@ -1,3 +1,5 @@
+'use strict';
+
 function TorqueLayerStats() {
     this._types = {
         torque: true
diff --git a/lib/cartodb/backends/overviews-metadata.js b/lib/cartodb/backends/overviews-metadata.js
index 7eb7c889..f066c4ef 100644
--- a/lib/cartodb/backends/overviews-metadata.js
+++ b/lib/cartodb/backends/overviews-metadata.js
@@ -1,3 +1,5 @@
+'use strict';
+
 const queryUtils = require('../utils/query-utils');
 
 function OverviewsMetadataBackend(pgQueryRunner) {
diff --git a/lib/cartodb/backends/pg_connection.js b/lib/cartodb/backends/pg_connection.js
index 0a9b29bd..9c7ed4c3 100644
--- a/lib/cartodb/backends/pg_connection.js
+++ b/lib/cartodb/backends/pg_connection.js
@@ -1,3 +1,5 @@
+'use strict';
+
 var PSQL = require('cartodb-psql');
 var _ = require('underscore');
 const debug = require('debug')('cachechan');
diff --git a/lib/cartodb/backends/pg_query_runner.js b/lib/cartodb/backends/pg_query_runner.js
index d3a16719..c96041c4 100644
--- a/lib/cartodb/backends/pg_query_runner.js
+++ b/lib/cartodb/backends/pg_query_runner.js
@@ -1,3 +1,5 @@
+'use strict';
+
 var PSQL = require('cartodb-psql');
 
 function PgQueryRunner(pgConnection) {
diff --git a/lib/cartodb/backends/stats.js b/lib/cartodb/backends/stats.js
index b0385bac..c3e5303d 100644
--- a/lib/cartodb/backends/stats.js
+++ b/lib/cartodb/backends/stats.js
@@ -1,3 +1,5 @@
+'use strict';
+
 var layerStats = require('./layer-stats/factory');
 
 function StatsBackend() {
diff --git a/lib/cartodb/backends/tables-extent.js b/lib/cartodb/backends/tables-extent.js
index 5e78a6b1..ff41701c 100644
--- a/lib/cartodb/backends/tables-extent.js
+++ b/lib/cartodb/backends/tables-extent.js
@@ -1,3 +1,5 @@
+'use strict';
+
 function TablesExtentBackend(pgQueryRunner) {
     this.pgQueryRunner = pgQueryRunner;
 }
diff --git a/lib/cartodb/backends/template_maps.js b/lib/cartodb/backends/template_maps.js
index 41e655bd..ea2d93fd 100644
--- a/lib/cartodb/backends/template_maps.js
+++ b/lib/cartodb/backends/template_maps.js
@@ -1,3 +1,5 @@
+'use strict';
+
 var crypto = require('crypto');
 var debug = require('debug')('windshaft:templates');
 var _ = require('underscore');
diff --git a/lib/cartodb/backends/user-limits.js b/lib/cartodb/backends/user-limits.js
index 2dc70470..6177007a 100644
--- a/lib/cartodb/backends/user-limits.js
+++ b/lib/cartodb/backends/user-limits.js
@@ -1,3 +1,5 @@
+'use strict';
+
 /**
  *
  * @param metadataBackend
diff --git a/lib/cartodb/cache/backend/fastly.js b/lib/cartodb/cache/backend/fastly.js
index 1dad622c..e1ca6b35 100644
--- a/lib/cartodb/cache/backend/fastly.js
+++ b/lib/cartodb/cache/backend/fastly.js
@@ -1,3 +1,5 @@
+'use strict';
+
 var FastlyPurge = require('fastly-purge');
 
 function FastlyCacheBackend(apiKey, serviceId) {
diff --git a/lib/cartodb/cache/backend/varnish_http.js b/lib/cartodb/cache/backend/varnish_http.js
index 760e1f11..35fa5330 100644
--- a/lib/cartodb/cache/backend/varnish_http.js
+++ b/lib/cartodb/cache/backend/varnish_http.js
@@ -1,3 +1,5 @@
+'use strict';
+
 var request = require('request');
 
 function VarnishHttpCacheBackend(host, port) {
diff --git a/lib/cartodb/cache/layergroup_affected_tables.js b/lib/cartodb/cache/layergroup_affected_tables.js
index d33c5a73..fb63eb37 100644
--- a/lib/cartodb/cache/layergroup_affected_tables.js
+++ b/lib/cartodb/cache/layergroup_affected_tables.js
@@ -1,3 +1,5 @@
+'use strict';
+
 var LruCache = require('lru-cache');
 
 function LayergroupAffectedTables() {
diff --git a/lib/cartodb/cache/model/named_maps_entry.js b/lib/cartodb/cache/model/named_maps_entry.js
index aaab7f3a..a4537368 100644
--- a/lib/cartodb/cache/model/named_maps_entry.js
+++ b/lib/cartodb/cache/model/named_maps_entry.js
@@ -1,3 +1,5 @@
+'use strict';
+
 var crypto = require('crypto');
 
 function NamedMaps(owner, name) {
diff --git a/lib/cartodb/cache/named_map_provider_cache.js b/lib/cartodb/cache/named_map_provider_cache.js
index b64decb1..d0e34883 100644
--- a/lib/cartodb/cache/named_map_provider_cache.js
+++ b/lib/cartodb/cache/named_map_provider_cache.js
@@ -1,3 +1,5 @@
+'use strict';
+
 var _ = require('underscore');
 var dot = require('dot');
 var NamedMapMapConfigProvider = require('../models/mapconfig/provider/named-map-provider');
diff --git a/lib/cartodb/cache/surrogate_keys_cache.js b/lib/cartodb/cache/surrogate_keys_cache.js
index 907e6345..bf4bc852 100644
--- a/lib/cartodb/cache/surrogate_keys_cache.js
+++ b/lib/cartodb/cache/surrogate_keys_cache.js
@@ -1,3 +1,5 @@
+'use strict';
+
 var queue = require('queue-async');
 
 /**
diff --git a/lib/cartodb/models/aggregation/aggregation-mapconfig.js b/lib/cartodb/models/aggregation/aggregation-mapconfig.js
index 98a71962..abd53fe3 100644
--- a/lib/cartodb/models/aggregation/aggregation-mapconfig.js
+++ b/lib/cartodb/models/aggregation/aggregation-mapconfig.js
@@ -1,3 +1,5 @@
+'use strict';
+
 const MapConfig = require('windshaft').model.MapConfig;
 const aggregationQuery = require('./aggregation-query');
 const aggregationValidator = require('./aggregation-validator');
diff --git a/lib/cartodb/models/aggregation/aggregation-query.js b/lib/cartodb/models/aggregation/aggregation-query.js
index 54a8e280..1bddf02d 100644
--- a/lib/cartodb/models/aggregation/aggregation-query.js
+++ b/lib/cartodb/models/aggregation/aggregation-query.js
@@ -1,3 +1,5 @@
+'use strict';
+
 const timeDimension = require('./time-dimension');
 
 const DEFAULT_PLACEMENT = 'point-sample';
diff --git a/lib/cartodb/models/aggregation/aggregation-validator.js b/lib/cartodb/models/aggregation/aggregation-validator.js
index ce038f05..257e7980 100644
--- a/lib/cartodb/models/aggregation/aggregation-validator.js
+++ b/lib/cartodb/models/aggregation/aggregation-validator.js
@@ -1,3 +1,5 @@
+'use strict';
+
 module.exports = function aggregationValidator (mapconfig) {
     return function validateProperty (key, validator) {
         for (let index = 0; index < mapconfig.getLayers().length; index++) {
diff --git a/lib/cartodb/models/aggregation/time-dimension.js b/lib/cartodb/models/aggregation/time-dimension.js
index 898f6a82..bd14bbf2 100644
--- a/lib/cartodb/models/aggregation/time-dimension.js
+++ b/lib/cartodb/models/aggregation/time-dimension.js
@@ -1,3 +1,5 @@
+'use strict';
+
 // timezones can be defined either by an numeric offset in seconds or by
 // a valid (case-insensitive) tz/PG name;
 // they include abbreviations defined by PG (which have precedence and
diff --git a/lib/cartodb/models/cdb_request.js b/lib/cartodb/models/cdb_request.js
index 6650dd08..54593c17 100644
--- a/lib/cartodb/models/cdb_request.js
+++ b/lib/cartodb/models/cdb_request.js
@@ -1,3 +1,5 @@
+'use strict';
+
 function CdbRequest() {
     this.RE_USER_FROM_HOST = new RegExp(global.environment.user_from_host ||
             '^([^\\.]+)\\.' // would extract "strk" from "strk.cartodb.com"
diff --git a/lib/cartodb/models/dataview/aggregation.js b/lib/cartodb/models/dataview/aggregation.js
index 7820ddbc..4efbbba2 100644
--- a/lib/cartodb/models/dataview/aggregation.js
+++ b/lib/cartodb/models/dataview/aggregation.js
@@ -1,3 +1,5 @@
+'use strict';
+
 const BaseDataview = require('./base');
 const debug = require('debug')('windshaft:dataview:aggregation');
 
diff --git a/lib/cartodb/models/dataview/base.js b/lib/cartodb/models/dataview/base.js
index 455461a2..8525224f 100644
--- a/lib/cartodb/models/dataview/base.js
+++ b/lib/cartodb/models/dataview/base.js
@@ -1,3 +1,5 @@
+'use strict';
+
 const FLOAT_OIDS = {
     700: true,
     701: true,
diff --git a/lib/cartodb/models/dataview/factory.js b/lib/cartodb/models/dataview/factory.js
index fa55641c..729305fc 100644
--- a/lib/cartodb/models/dataview/factory.js
+++ b/lib/cartodb/models/dataview/factory.js
@@ -1,3 +1,5 @@
+'use strict';
+
 const dataviews = require('./');
 
 module.exports = class DataviewFactory {
diff --git a/lib/cartodb/models/dataview/formula.js b/lib/cartodb/models/dataview/formula.js
index df009e4b..a0b3278a 100644
--- a/lib/cartodb/models/dataview/formula.js
+++ b/lib/cartodb/models/dataview/formula.js
@@ -1,3 +1,5 @@
+'use strict';
+
 const BaseDataview = require('./base');
 const debug = require('debug')('windshaft:dataview:formula');
 const utils = require('../../utils/query-utils');
diff --git a/lib/cartodb/models/dataview/histogram.js b/lib/cartodb/models/dataview/histogram.js
index affbbd25..bc51979e 100644
--- a/lib/cartodb/models/dataview/histogram.js
+++ b/lib/cartodb/models/dataview/histogram.js
@@ -1,3 +1,5 @@
+'use strict';
+
 const debug = require('debug')('windshaft:dataview:histogram');
 const NumericHistogram = require('./histograms/numeric-histogram');
 const DateHistogram = require('./histograms/date-histogram');
diff --git a/lib/cartodb/models/dataview/histograms/base-histogram.js b/lib/cartodb/models/dataview/histograms/base-histogram.js
index ec251d09..29496632 100644
--- a/lib/cartodb/models/dataview/histograms/base-histogram.js
+++ b/lib/cartodb/models/dataview/histograms/base-histogram.js
@@ -1,3 +1,5 @@
+'use strict';
+
 const BaseDataview = require('../base');
 
 const TYPE = 'histogram';
diff --git a/lib/cartodb/models/dataview/histograms/date-histogram.js b/lib/cartodb/models/dataview/histograms/date-histogram.js
index 86e0e539..632c4438 100644
--- a/lib/cartodb/models/dataview/histograms/date-histogram.js
+++ b/lib/cartodb/models/dataview/histograms/date-histogram.js
@@ -1,3 +1,5 @@
+'use strict';
+
 const BaseHistogram = require('./base-histogram');
 const debug = require('debug')('windshaft:dataview:date-histogram');
 const utils = require('../../../utils/query-utils');
diff --git a/lib/cartodb/models/dataview/histograms/numeric-histogram.js b/lib/cartodb/models/dataview/histograms/numeric-histogram.js
index f26a0f80..ddf3577f 100644
--- a/lib/cartodb/models/dataview/histograms/numeric-histogram.js
+++ b/lib/cartodb/models/dataview/histograms/numeric-histogram.js
@@ -1,3 +1,5 @@
+'use strict';
+
 const BaseHistogram = require('./base-histogram');
 const debug = require('debug')('windshaft:dataview:numeric-histogram');
 const utils = require('../../../utils/query-utils');
diff --git a/lib/cartodb/models/dataview/index.js b/lib/cartodb/models/dataview/index.js
index 05cfaab7..0fc107d3 100644
--- a/lib/cartodb/models/dataview/index.js
+++ b/lib/cartodb/models/dataview/index.js
@@ -1,3 +1,5 @@
+'use strict';
+
 module.exports = {
     Aggregation: require('./aggregation'),
     Formula: require('./formula'),
diff --git a/lib/cartodb/models/dataview/overviews/aggregation.js b/lib/cartodb/models/dataview/overviews/aggregation.js
index 312a398e..1d0f7de6 100644
--- a/lib/cartodb/models/dataview/overviews/aggregation.js
+++ b/lib/cartodb/models/dataview/overviews/aggregation.js
@@ -1,3 +1,5 @@
+'use strict';
+
 var BaseOverviewsDataview = require('./base');
 var BaseDataview = require('../aggregation');
 var debug = require('debug')('windshaft:widget:aggregation:overview');
diff --git a/lib/cartodb/models/dataview/overviews/base.js b/lib/cartodb/models/dataview/overviews/base.js
index 38b2c119..9b1c7c58 100644
--- a/lib/cartodb/models/dataview/overviews/base.js
+++ b/lib/cartodb/models/dataview/overviews/base.js
@@ -1,3 +1,5 @@
+'use strict';
+
 var _ = require('underscore');
 var BaseDataview = require('../base');
 
diff --git a/lib/cartodb/models/dataview/overviews/factory.js b/lib/cartodb/models/dataview/overviews/factory.js
index d7a07d54..1a402f88 100644
--- a/lib/cartodb/models/dataview/overviews/factory.js
+++ b/lib/cartodb/models/dataview/overviews/factory.js
@@ -1,3 +1,5 @@
+'use strict';
+
 var parentFactory = require('../factory');
 var dataviews = require('./');
 
diff --git a/lib/cartodb/models/dataview/overviews/formula.js b/lib/cartodb/models/dataview/overviews/formula.js
index dd487ccb..73aa2f57 100644
--- a/lib/cartodb/models/dataview/overviews/formula.js
+++ b/lib/cartodb/models/dataview/overviews/formula.js
@@ -1,3 +1,5 @@
+'use strict';
+
 var BaseOverviewsDataview = require('./base');
 var BaseDataview = require('../formula');
 var debug = require('debug')('windshaft:widget:formula:overview');
diff --git a/lib/cartodb/models/dataview/overviews/histogram.js b/lib/cartodb/models/dataview/overviews/histogram.js
index cc7e7342..91c2818c 100644
--- a/lib/cartodb/models/dataview/overviews/histogram.js
+++ b/lib/cartodb/models/dataview/overviews/histogram.js
@@ -1,3 +1,5 @@
+'use strict';
+
 var _ = require('underscore');
 var BaseOverviewsDataview = require('./base');
 var BaseDataview = require('../histogram');
@@ -278,5 +280,3 @@ Histogram.prototype._shouldOverride = function (override) {
 Histogram.prototype._shouldOverrideBins = function (override) {
     return override && _.has(override, 'bins');
 };
-
-
diff --git a/lib/cartodb/models/dataview/overviews/index.js b/lib/cartodb/models/dataview/overviews/index.js
index ac032749..8b5cf9f7 100644
--- a/lib/cartodb/models/dataview/overviews/index.js
+++ b/lib/cartodb/models/dataview/overviews/index.js
@@ -1,3 +1,5 @@
+'use strict';
+
 module.exports = {
   Aggregation: require('./aggregation'),
   Formula: require('./formula'),
diff --git a/lib/cartodb/models/filter/analysis.js b/lib/cartodb/models/filter/analysis.js
index a0975662..1da580c6 100644
--- a/lib/cartodb/models/filter/analysis.js
+++ b/lib/cartodb/models/filter/analysis.js
@@ -1,3 +1,5 @@
+'use strict';
+
 var filters = {
     category: require('./analysis/category'),
     range: require('./analysis/range')
diff --git a/lib/cartodb/models/filter/bbox.js b/lib/cartodb/models/filter/bbox.js
index 0f7072ae..1766ba8c 100644
--- a/lib/cartodb/models/filter/bbox.js
+++ b/lib/cartodb/models/filter/bbox.js
@@ -1,3 +1,5 @@
+'use strict';
+
 var debug = require('debug')('windshaft:filter:bbox');
 var dot = require('dot');
 dot.templateSettings.strip = false;
diff --git a/lib/cartodb/models/layergroup-token.js b/lib/cartodb/models/layergroup-token.js
index 67691bf6..8c51bed5 100644
--- a/lib/cartodb/models/layergroup-token.js
+++ b/lib/cartodb/models/layergroup-token.js
@@ -1,3 +1,5 @@
+'use strict';
+
 /**
  * @param {String} token might match the following pattern: {user}@{tpl_id}@{token}:{cache_buster}
  */
diff --git a/lib/cartodb/models/mapconfig/adapter/aggregation-mapconfig-adapter.js b/lib/cartodb/models/mapconfig/adapter/aggregation-mapconfig-adapter.js
index 82de77d1..ceb3e031 100644
--- a/lib/cartodb/models/mapconfig/adapter/aggregation-mapconfig-adapter.js
+++ b/lib/cartodb/models/mapconfig/adapter/aggregation-mapconfig-adapter.js
@@ -1,3 +1,5 @@
+'use strict';
+
 const AggregationMapConfig = require('../../aggregation/aggregation-mapconfig');
 const queryUtils = require('../../../utils/query-utils');
 
diff --git a/lib/cartodb/models/mapconfig/adapter/analysis-mapconfig-adapter.js b/lib/cartodb/models/mapconfig/adapter/analysis-mapconfig-adapter.js
index 9fdd2d09..c4a71272 100644
--- a/lib/cartodb/models/mapconfig/adapter/analysis-mapconfig-adapter.js
+++ b/lib/cartodb/models/mapconfig/adapter/analysis-mapconfig-adapter.js
@@ -1,3 +1,5 @@
+'use strict';
+
 var queue = require('queue-async');
 var debug = require('debug')('windshaft:analysis');
 
diff --git a/lib/cartodb/models/mapconfig/adapter/dataviews-widgets-adapter.js b/lib/cartodb/models/mapconfig/adapter/dataviews-widgets-adapter.js
index 8ae13272..f59c0d27 100644
--- a/lib/cartodb/models/mapconfig/adapter/dataviews-widgets-adapter.js
+++ b/lib/cartodb/models/mapconfig/adapter/dataviews-widgets-adapter.js
@@ -1,3 +1,5 @@
+'use strict';
+
 function DataviewsWidgetsMapConfigAdapter() {
 }
 
diff --git a/lib/cartodb/models/mapconfig/adapter/mapconfig-buffer-size-adapter.js b/lib/cartodb/models/mapconfig/adapter/mapconfig-buffer-size-adapter.js
index aead2d91..07fc45bc 100644
--- a/lib/cartodb/models/mapconfig/adapter/mapconfig-buffer-size-adapter.js
+++ b/lib/cartodb/models/mapconfig/adapter/mapconfig-buffer-size-adapter.js
@@ -1,3 +1,5 @@
+'use strict';
+
 function MapConfigBufferSizeAdapter() {
     this.formats = ['png', 'png32', 'mvt', 'grid.json'];
 }
diff --git a/lib/cartodb/models/mapconfig/adapter/mapconfig-named-layers-adapter.js b/lib/cartodb/models/mapconfig/adapter/mapconfig-named-layers-adapter.js
index f652e675..68d2a950 100644
--- a/lib/cartodb/models/mapconfig/adapter/mapconfig-named-layers-adapter.js
+++ b/lib/cartodb/models/mapconfig/adapter/mapconfig-named-layers-adapter.js
@@ -1,3 +1,5 @@
+'use strict';
+
 var queue = require('queue-async');
 var _ = require('underscore');
 var Datasource = require('windshaft').model.Datasource;
diff --git a/lib/cartodb/models/mapconfig/adapter/mapconfig-overviews-adapter.js b/lib/cartodb/models/mapconfig/adapter/mapconfig-overviews-adapter.js
index 47179028..3d0f6580 100644
--- a/lib/cartodb/models/mapconfig/adapter/mapconfig-overviews-adapter.js
+++ b/lib/cartodb/models/mapconfig/adapter/mapconfig-overviews-adapter.js
@@ -1,3 +1,5 @@
+'use strict';
+
 var queue = require('queue-async');
 var _ = require('underscore');
 
diff --git a/lib/cartodb/models/mapconfig/adapter/sql-wrap-mapconfig-adapter.js b/lib/cartodb/models/mapconfig/adapter/sql-wrap-mapconfig-adapter.js
index 8bb3d201..e3f030ce 100644
--- a/lib/cartodb/models/mapconfig/adapter/sql-wrap-mapconfig-adapter.js
+++ b/lib/cartodb/models/mapconfig/adapter/sql-wrap-mapconfig-adapter.js
@@ -1,3 +1,5 @@
+'use strict';
+
 function SqlWrapMapConfigAdapter() {
 }
 
diff --git a/lib/cartodb/models/mapconfig/adapter/vector-mapconfig-adapter.js b/lib/cartodb/models/mapconfig/adapter/vector-mapconfig-adapter.js
index bedea8b8..dd03f3fe 100644
--- a/lib/cartodb/models/mapconfig/adapter/vector-mapconfig-adapter.js
+++ b/lib/cartodb/models/mapconfig/adapter/vector-mapconfig-adapter.js
@@ -1,3 +1,5 @@
+'use strict';
+
 const queryUtils = require('../../../utils/query-utils');
 const dateWrapper = require('../../../utils/date-wrapper');
 
@@ -60,4 +62,4 @@ class VectorMapConfigAdapter {
 }
 
 
-module.exports = VectorMapConfigAdapter;
\ No newline at end of file
+module.exports = VectorMapConfigAdapter;
diff --git a/lib/cartodb/models/mapconfig/provider/base-mapconfig-adapter.js b/lib/cartodb/models/mapconfig/provider/base-mapconfig-adapter.js
index c783bdd4..de156217 100644
--- a/lib/cartodb/models/mapconfig/provider/base-mapconfig-adapter.js
+++ b/lib/cartodb/models/mapconfig/provider/base-mapconfig-adapter.js
@@ -1,3 +1,5 @@
+'use strict';
+
 const QueryTables = require('cartodb-query-tables');
 
 module.exports = class BaseMapConfigProvider {
diff --git a/lib/cartodb/models/mapconfig/provider/create-layergroup-provider.js b/lib/cartodb/models/mapconfig/provider/create-layergroup-provider.js
index 6d33c912..15e2fc6f 100644
--- a/lib/cartodb/models/mapconfig/provider/create-layergroup-provider.js
+++ b/lib/cartodb/models/mapconfig/provider/create-layergroup-provider.js
@@ -1,3 +1,5 @@
+'use strict';
+
 const MapStoreMapConfigProvider = require('./map-store-provider');
 
 module.exports = class CreateLayergroupMapConfigProvider extends MapStoreMapConfigProvider {
diff --git a/lib/cartodb/models/mapconfig/provider/map-store-provider.js b/lib/cartodb/models/mapconfig/provider/map-store-provider.js
index b3210298..b0dda9d1 100644
--- a/lib/cartodb/models/mapconfig/provider/map-store-provider.js
+++ b/lib/cartodb/models/mapconfig/provider/map-store-provider.js
@@ -1,3 +1,5 @@
+'use strict';
+
 const BaseMapConfigProvider = require('./base-mapconfig-adapter');
 const dot = require('dot');
 
diff --git a/lib/cartodb/models/mapconfig/provider/named-map-provider.js b/lib/cartodb/models/mapconfig/provider/named-map-provider.js
index ee0e0bd2..513fb7b7 100644
--- a/lib/cartodb/models/mapconfig/provider/named-map-provider.js
+++ b/lib/cartodb/models/mapconfig/provider/named-map-provider.js
@@ -1,3 +1,5 @@
+'use strict';
+
 const BaseMapConfigProvider = require('./base-mapconfig-adapter');
 const crypto = require('crypto');
 const dot = require('dot');
diff --git a/lib/cartodb/models/resource-locator.js b/lib/cartodb/models/resource-locator.js
index f9b1c1ad..1eba6638 100644
--- a/lib/cartodb/models/resource-locator.js
+++ b/lib/cartodb/models/resource-locator.js
@@ -1,3 +1,5 @@
+'use strict';
+
 var dot = require('dot');
 dot.templateSettings.strip = false;
 
@@ -73,7 +75,7 @@ ResourceLocator.prototype.getUrls = function(username, resourcePath) {
     }
 };
 
-function urlForTemplate(tpl, username, cdnDomain, resource, templated) {
+ResourceLocator.prototype.urlForTemplate = function (tpl, username, cdnDomain, resource, templated) {
     cdnDomain = cdnDomain || {};
     if (templated) {
         return {
@@ -101,16 +103,28 @@ function urlForTemplate(tpl, username, cdnDomain, resource, templated) {
             resource: resource.getPath()
         });
     }
-}
+};
 
 ResourceLocator.prototype.getUrlsFromTemplate = function(username, resource, templated) {
     var urls = {};
     var cdnDomain = getCdnDomain(this.environment.serverMetadata, resource) || {};
     if (this.resourcesUrlTemplates.http) {
-        urls.http = urlForTemplate(this.resourcesUrlTemplates.http, username, cdnDomain.http, resource, templated);
+        urls.http = this.urlForTemplate(
+            this.resourcesUrlTemplates.http,
+            username,
+            cdnDomain.http,
+            resource,
+            templated
+        );
     }
     if (this.resourcesUrlTemplates.https) {
-        urls.https = urlForTemplate(this.resourcesUrlTemplates.https, username, cdnDomain.https, resource, templated);
+        urls.https = this.urlForTemplate(
+            this.resourcesUrlTemplates.https,
+            username,
+            cdnDomain.https,
+            resource,
+            templated
+        );
     }
 
     return urls;
diff --git a/lib/cartodb/monitoring/health_check.js b/lib/cartodb/monitoring/health_check.js
index 294390cf..31cc8245 100644
--- a/lib/cartodb/monitoring/health_check.js
+++ b/lib/cartodb/monitoring/health_check.js
@@ -1,3 +1,5 @@
+'use strict';
+
 var fs = require('fs');
 
 function HealthCheck(disableFile) {
diff --git a/lib/cartodb/server-info-controller.js b/lib/cartodb/server-info-controller.js
index 17e0649c..d81051cb 100644
--- a/lib/cartodb/server-info-controller.js
+++ b/lib/cartodb/server-info-controller.js
@@ -1,3 +1,5 @@
+'use strict';
+
 var HealthCheck = require('./monitoring/health_check');
 
 var WELCOME_MSG = "This is the CartoDB Maps API, " +
diff --git a/lib/cartodb/server.js b/lib/cartodb/server.js
index ea51f2db..3e1b3c4c 100644
--- a/lib/cartodb/server.js
+++ b/lib/cartodb/server.js
@@ -1,3 +1,5 @@
+'use strict';
+
 const _ = require('underscore');
 const express = require('express');
 const windshaft = require('windshaft');
@@ -61,9 +63,7 @@ function mapnikVersion(opts) {
 }
 
 function getAndValidateVersions(options) {
-    // jshint undef:false
-    var warn = console.warn.bind(console);
-    // jshint undef:true
+    var warn = console.warn.bind(console); // jshint ignore:line
 
     var packageDefinition = require('../../package.json');
 
diff --git a/lib/cartodb/server_options.js b/lib/cartodb/server_options.js
index d1996b6b..5c19ee9a 100644
--- a/lib/cartodb/server_options.js
+++ b/lib/cartodb/server_options.js
@@ -1,3 +1,5 @@
+'use strict';
+
 const fqdn = require('@carto/fqdn-sync');
 var _ = require('underscore');
 var OverviewsQueryRewriter = require('./utils/overviews_query_rewriter');
diff --git a/lib/cartodb/stats/client.js b/lib/cartodb/stats/client.js
index 614344cb..be6f6c13 100644
--- a/lib/cartodb/stats/client.js
+++ b/lib/cartodb/stats/client.js
@@ -1,3 +1,5 @@
+'use strict';
+
 var _ = require('underscore');
 var debug = require('debug')('windshaft:stats_client');
 var StatsD = require('node-statsd').StatsD;
@@ -70,4 +72,4 @@ module.exports = {
 
         return this.instance;
     }
-};
\ No newline at end of file
+};
diff --git a/lib/cartodb/stats/profiler_proxy.js b/lib/cartodb/stats/profiler_proxy.js
index 1e1f91e7..5ac60d57 100644
--- a/lib/cartodb/stats/profiler_proxy.js
+++ b/lib/cartodb/stats/profiler_proxy.js
@@ -1,3 +1,5 @@
+'use strict';
+
 var Profiler = require('step-profiler');
 
 /**
diff --git a/lib/cartodb/stats/reporter/renderer.js b/lib/cartodb/stats/reporter/renderer.js
index 18545202..60899918 100644
--- a/lib/cartodb/stats/reporter/renderer.js
+++ b/lib/cartodb/stats/reporter/renderer.js
@@ -1,3 +1,5 @@
+'use strict';
+
 //  - Reports stats about:
 //    * Total number of renderers
 //    * For mapnik renderers:
diff --git a/lib/cartodb/stats/timer.js b/lib/cartodb/stats/timer.js
index 0ef725ab..f15c423a 100644
--- a/lib/cartodb/stats/timer.js
+++ b/lib/cartodb/stats/timer.js
@@ -1,3 +1,5 @@
+'use strict';
+
 function Timer() {
     this.times = {};
 }
diff --git a/lib/cartodb/utils/database-params.js b/lib/cartodb/utils/database-params.js
index a2176eaf..425b7616 100644
--- a/lib/cartodb/utils/database-params.js
+++ b/lib/cartodb/utils/database-params.js
@@ -1,3 +1,5 @@
+'use strict';
+
 module.exports = function getDatabaseConnectionParams (params) {
     const dbParams = {};
 
diff --git a/lib/cartodb/utils/date-wrapper.js b/lib/cartodb/utils/date-wrapper.js
index 3d458978..4cf4fd31 100644
--- a/lib/cartodb/utils/date-wrapper.js
+++ b/lib/cartodb/utils/date-wrapper.js
@@ -1,3 +1,5 @@
+'use strict';
+
 const DATE_OIDS = Object.freeze({
     1082: 'DATE',
     1083: 'TIME',
diff --git a/lib/cartodb/utils/json-replacer.js b/lib/cartodb/utils/json-replacer.js
index cccac1f6..7ec959b3 100644
--- a/lib/cartodb/utils/json-replacer.js
+++ b/lib/cartodb/utils/json-replacer.js
@@ -1,3 +1,5 @@
+'use strict';
+
 module.exports = function jsonReplacerFactory () {
     // Fix: https://github.com/CartoDB/Windshaft-cartodb/issues/705
     // See: http://expressjs.com/en/4x/api.html#app.set
diff --git a/lib/cartodb/utils/layergroup-metadata.js b/lib/cartodb/utils/layergroup-metadata.js
index ee2e78c4..1a62f701 100644
--- a/lib/cartodb/utils/layergroup-metadata.js
+++ b/lib/cartodb/utils/layergroup-metadata.js
@@ -1,3 +1,5 @@
+'use strict';
+
 const dateWrapper = require('./date-wrapper');
 const querystring = require('querystring');
 
diff --git a/lib/cartodb/utils/overviews_query_rewriter.js b/lib/cartodb/utils/overviews_query_rewriter.js
index 8dcc2f08..cf61b070 100644
--- a/lib/cartodb/utils/overviews_query_rewriter.js
+++ b/lib/cartodb/utils/overviews_query_rewriter.js
@@ -1,3 +1,5 @@
+'use strict';
+
 var _ = require('underscore');
 var TableNameParser = require('./table_name_parser');
 
diff --git a/lib/cartodb/utils/query-utils.js b/lib/cartodb/utils/query-utils.js
index 633a02a4..2fc00c5a 100644
--- a/lib/cartodb/utils/query-utils.js
+++ b/lib/cartodb/utils/query-utils.js
@@ -1,3 +1,5 @@
+'use strict';
+
 const SubstitutionTokens = require('./substitution-tokens');
 
 function prepareQuery(sql) {
@@ -211,4 +213,3 @@ module.exports.queryPromise = queryPromise;
 module.exports.getQueryLimited = getQueryLimited;
 module.exports.substituteDummyTokens = substituteDummyTokens;
 module.exports.subsituteTokensForZoom = subsituteTokensForZoom;
-
diff --git a/lib/cartodb/utils/substitution-tokens.js b/lib/cartodb/utils/substitution-tokens.js
index 5905fa4d..b6bd3cf4 100644
--- a/lib/cartodb/utils/substitution-tokens.js
+++ b/lib/cartodb/utils/substitution-tokens.js
@@ -1,3 +1,5 @@
+'use strict';
+
 var SUBSTITUTION_TOKENS = {
     bbox: /!bbox!/g,
     scale_denominator: /!scale_denominator!/g,
diff --git a/lib/cartodb/utils/table_name_parser.js b/lib/cartodb/utils/table_name_parser.js
index f71c3f34..f2550ad6 100644
--- a/lib/cartodb/utils/table_name_parser.js
+++ b/lib/cartodb/utils/table_name_parser.js
@@ -1,3 +1,5 @@
+'use strict';
+
 // Quote an PostgreSQL identifier if ncecessary
 function quote_identifier_if_needed(txt) {
     if ( txt && !txt.match(/^[a-z_][a-z_0-9]*$/)) {
diff --git a/package.json b/package.json
index 937d0d11..e0a73e05 100644
--- a/package.json
+++ b/package.json
@@ -27,10 +27,10 @@
     "@carto/fqdn-sync": "0.2.2",
     "basic-auth": "2.0.0",
     "body-parser": "1.18.3",
-    "camshaft": "0.62.3",
+    "camshaft": "0.62.4",
     "cartodb-psql": "0.11.0",
     "cartodb-query-tables": "0.3.0",
-    "cartodb-redis": "2.0.1",
+    "cartodb-redis": "2.0.2",
     "debug": "3.1.0",
     "dot": "1.1.2",
     "express": "4.16.3",
@@ -42,13 +42,13 @@
     "node-statsd": "0.1.1",
     "on-headers": "1.0.1",
     "queue-async": "1.1.0",
-    "redis-mpool": "0.5.0",
+    "redis-mpool": "0.6.0",
     "request": "2.87.0",
     "semver": "5.5.0",
     "step-profiler": "0.3.0",
     "turbo-carto": "0.20.4",
     "underscore": "1.6.0",
-    "windshaft": "4.11.4",
+    "windshaft": "4.11.5",
     "yargs": "11.1.0"
   },
   "devDependencies": {
@@ -62,7 +62,7 @@
     "strftime": "0.10.0"
   },
   "scripts": {
-    "lint": "jshint lib test",
+    "lint": "jshint lib test app.js",
     "preinstall": "make pre-install",
     "test": "make test-all",
     "update-internal-deps": "rm -rf node_modules && rm -f yarn.lock && yarn",
diff --git a/test/acceptance/aggregation.js b/test/acceptance/aggregation.js
index 095eca51..d9924eee 100644
--- a/test/acceptance/aggregation.js
+++ b/test/acceptance/aggregation.js
@@ -1,3 +1,5 @@
+'use strict';
+
 require('../support/test_helper');
 
 const assert = require('../support/assert');
diff --git a/test/acceptance/analysis/analyses-controller.js b/test/acceptance/analysis/analyses-controller.js
index dd1d138c..6ed0808b 100644
--- a/test/acceptance/analysis/analyses-controller.js
+++ b/test/acceptance/analysis/analyses-controller.js
@@ -1,3 +1,5 @@
+'use strict';
+
 require('../../support/test_helper');
 
 var assert = require('../../support/assert');
diff --git a/test/acceptance/analysis/analyses-filters-params.js b/test/acceptance/analysis/analyses-filters-params.js
index c4a17ae4..21fd8f01 100644
--- a/test/acceptance/analysis/analyses-filters-params.js
+++ b/test/acceptance/analysis/analyses-filters-params.js
@@ -1,3 +1,5 @@
+'use strict';
+
 require('../../support/test_helper');
 
 const assert = require('../../support/assert');
diff --git a/test/acceptance/analysis/analyses-filters.js b/test/acceptance/analysis/analyses-filters.js
index 152b29e6..ff86855f 100644
--- a/test/acceptance/analysis/analyses-filters.js
+++ b/test/acceptance/analysis/analyses-filters.js
@@ -1,3 +1,5 @@
+'use strict';
+
 require('../../support/test_helper');
 
 const assert = require('../../support/assert');
diff --git a/test/acceptance/analysis/analysis-layers-dataviews.js b/test/acceptance/analysis/analysis-layers-dataviews.js
index 8e95096a..7a35607f 100644
--- a/test/acceptance/analysis/analysis-layers-dataviews.js
+++ b/test/acceptance/analysis/analysis-layers-dataviews.js
@@ -1,3 +1,5 @@
+'use strict';
+
 require('../../support/test_helper');
 
 var assert = require('../../support/assert');
diff --git a/test/acceptance/analysis/analysis-layers-use-cases.js b/test/acceptance/analysis/analysis-layers-use-cases.js
index 2f087626..cc10c7dc 100644
--- a/test/acceptance/analysis/analysis-layers-use-cases.js
+++ b/test/acceptance/analysis/analysis-layers-use-cases.js
@@ -1,3 +1,5 @@
+'use strict';
+
 require('../../support/test_helper');
 
 var assert = require('../../support/assert');
diff --git a/test/acceptance/analysis/analysis-layers.js b/test/acceptance/analysis/analysis-layers.js
index 1eb3d4e6..b7eeac48 100644
--- a/test/acceptance/analysis/analysis-layers.js
+++ b/test/acceptance/analysis/analysis-layers.js
@@ -1,3 +1,5 @@
+'use strict';
+
 require('../../support/test_helper');
 
 var assert = require('../../support/assert');
diff --git a/test/acceptance/analysis/error-cases.js b/test/acceptance/analysis/error-cases.js
index 2e2ea922..5c610dde 100644
--- a/test/acceptance/analysis/error-cases.js
+++ b/test/acceptance/analysis/error-cases.js
@@ -1,3 +1,5 @@
+'use strict';
+
 require('../../support/test_helper');
 
 var assert = require('../../support/assert');
diff --git a/test/acceptance/analysis/named-maps.js b/test/acceptance/analysis/named-maps.js
index 5172b110..dd34b7dd 100644
--- a/test/acceptance/analysis/named-maps.js
+++ b/test/acceptance/analysis/named-maps.js
@@ -1,3 +1,5 @@
+'use strict';
+
 var assert = require('../../support/assert');
 
 var helper = require('../../support/test_helper');
diff --git a/test/acceptance/analysis/regressions.js b/test/acceptance/analysis/regressions.js
index 94089ac0..72fd9a35 100644
--- a/test/acceptance/analysis/regressions.js
+++ b/test/acceptance/analysis/regressions.js
@@ -1,3 +1,5 @@
+'use strict';
+
 require('../../support/test_helper');
 
 var assert = require('../../support/assert');
diff --git a/test/acceptance/auth/authorization-basic-use-cases.js b/test/acceptance/auth/authorization-basic-use-cases.js
index 58db5775..d0c3a17c 100644
--- a/test/acceptance/auth/authorization-basic-use-cases.js
+++ b/test/acceptance/auth/authorization-basic-use-cases.js
@@ -1,3 +1,5 @@
+'use strict';
+
 const assert = require('../../support/assert');
 const testHelper = require('../../support/test_helper');
 const CartodbWindshaft = require('../../../lib/cartodb/server');
diff --git a/test/acceptance/auth/authorization.js b/test/acceptance/auth/authorization.js
index 2974d36d..7fff7aa3 100644
--- a/test/acceptance/auth/authorization.js
+++ b/test/acceptance/auth/authorization.js
@@ -1,3 +1,5 @@
+'use strict';
+
 require('../../support/test_helper');
 
 const assert = require('../../support/assert');
@@ -927,6 +929,6 @@ describe('authorization', function() {
                 });
             });
 
-        });    
+        });
     });
 });
diff --git a/test/acceptance/buffer-size-format.js b/test/acceptance/buffer-size-format.js
index a69a30ed..c8d36740 100644
--- a/test/acceptance/buffer-size-format.js
+++ b/test/acceptance/buffer-size-format.js
@@ -1,3 +1,5 @@
+'use strict';
+
 require('../support/test_helper');
 
 var fs = require('fs');
diff --git a/test/acceptance/cache/cache_headers.js b/test/acceptance/cache/cache_headers.js
index 8e0cb9f3..46a22026 100644
--- a/test/acceptance/cache/cache_headers.js
+++ b/test/acceptance/cache/cache_headers.js
@@ -1,3 +1,5 @@
+'use strict';
+
 var testHelper = require('../../support/test_helper');
 
 var assert = require('../../support/assert');
diff --git a/test/acceptance/cache/surrogate_keys_invalidation.js b/test/acceptance/cache/surrogate_keys_invalidation.js
index 36985e5e..aa22892b 100644
--- a/test/acceptance/cache/surrogate_keys_invalidation.js
+++ b/test/acceptance/cache/surrogate_keys_invalidation.js
@@ -1,3 +1,5 @@
+'use strict';
+
 var testHelper = require('../../support/test_helper');
 
 var assert      = require('../../support/assert');
diff --git a/test/acceptance/dataviews/aggregation.js b/test/acceptance/dataviews/aggregation.js
index fb46fb26..c6df346b 100644
--- a/test/acceptance/dataviews/aggregation.js
+++ b/test/acceptance/dataviews/aggregation.js
@@ -1,3 +1,5 @@
+'use strict';
+
 require('../../support/test_helper');
 var assert = require('../../support/assert');
 var TestClient = require('../../support/test-client');
diff --git a/test/acceptance/dataviews/error-cases.js b/test/acceptance/dataviews/error-cases.js
index 78acba5d..835efa53 100644
--- a/test/acceptance/dataviews/error-cases.js
+++ b/test/acceptance/dataviews/error-cases.js
@@ -1,10 +1,12 @@
+'use strict';
+
 require('../../support/test_helper');
 
 var assert = require('../../support/assert');
 var TestClient = require('../../support/test-client');
 
 describe('dataview error cases', function() {
-    
+
     describe('generic errors', function() {
 
         afterEach(function(done) {
@@ -21,7 +23,7 @@ describe('dataview error cases', function() {
                 'Content-Type': 'application/json; charset=utf-8'
             }
         };
-    
+
         function createMapConfig(dataviews) {
             return {
                 version: '1.5.0',
@@ -49,40 +51,40 @@ describe('dataview error cases', function() {
                 ]
             };
         }
-    
+
         it('should fail when invalid dataviews object is provided, string case', function(done) {
             var mapConfig = createMapConfig("wadus-string");
             this.testClient = new TestClient(mapConfig, 1234);
             this.testClient.getLayergroup({ response: ERROR_RESPONSE }, function(err, errObj) {
                 assert.ok(!err, err);
-    
+
                 assert.deepEqual(errObj.errors, [ '"dataviews" must be a valid JSON object: "string" type found' ]);
-    
+
                 done();
             });
         });
-    
+
         it('should fail when invalid dataviews object is provided, array case', function(done) {
             var mapConfig = createMapConfig([]);
             this.testClient = new TestClient(mapConfig, 1234);
             this.testClient.getLayergroup({ response: ERROR_RESPONSE }, function(err, errObj) {
                 assert.ok(!err, err);
-    
+
                 assert.deepEqual(errObj.errors, [ '"dataviews" must be a valid JSON object: "array" type found' ]);
-    
+
                 done();
             });
         });
-    
+
         it('should work with empty but valid objects', function(done) {
             var mapConfig = createMapConfig({});
             this.testClient = new TestClient(mapConfig, 1234);
             this.testClient.getLayergroup(function(err, layergroup) {
                 assert.ok(!err, err);
-    
+
                 assert.ok(layergroup);
                 assert.ok(layergroup.layergroupid);
-    
+
                 done();
             });
         });
@@ -132,7 +134,7 @@ describe('dataview error cases', function() {
                         }
                     }
                 }
-            };    
+            };
         }
 
         it('should work without filters', function(done) {
@@ -184,7 +186,7 @@ describe('dataview error cases', function() {
                 done();
             });
         });
-        
+
         it('should not fail if query does not return rows', function(done) {
             const query = 'select * from populated_places_simple_reduced limit 0';
 
@@ -198,7 +200,7 @@ describe('dataview error cases', function() {
                 max: 0,
                 categoriesCount: 0,
                 categories: [],
-                type: 'aggregation' 
+                type: 'aggregation'
             };
 
             this.testClient = new TestClient(createMapConfig(query));
diff --git a/test/acceptance/dataviews/formula.js b/test/acceptance/dataviews/formula.js
index c6f92afc..028b6368 100644
--- a/test/acceptance/dataviews/formula.js
+++ b/test/acceptance/dataviews/formula.js
@@ -1,3 +1,5 @@
+'use strict';
+
 require('../../support/test_helper');
 var assert = require('../../support/assert');
 var TestClient = require('../../support/test-client');
diff --git a/test/acceptance/dataviews/histogram.js b/test/acceptance/dataviews/histogram.js
index db558087..aa89d53e 100644
--- a/test/acceptance/dataviews/histogram.js
+++ b/test/acceptance/dataviews/histogram.js
@@ -1,3 +1,5 @@
+'use strict';
+
 require('../../support/test_helper');
 
 var assert = require('../../support/assert');
@@ -942,8 +944,8 @@ describe('histogram-dataview for date column type', function() {
         this.testClient.getDataview('datetime_histogram_tz', {}, function (err, dataview) {
             assert.ok(!err, err);
 
-            this.testClient = new TestClient(mapConfig, 1234);
-            this.testClient.getDataview('datetime_histogram_tz', params, function (err, filteredDataview) {
+            const _testClient = new TestClient(mapConfig, 1234);
+            _testClient.getDataview('datetime_histogram_tz', params, function (err, filteredDataview) {
                 assert.ok(!err, err);
 
                 assert.deepEqual(dataview, filteredDataview);
diff --git a/test/acceptance/dataviews/overviews.js b/test/acceptance/dataviews/overviews.js
index 3487a08b..7642dc73 100644
--- a/test/acceptance/dataviews/overviews.js
+++ b/test/acceptance/dataviews/overviews.js
@@ -1,3 +1,5 @@
+'use strict';
+
 require('../../support/test_helper');
 
 var assert = require('../../support/assert');
diff --git a/test/acceptance/date-wrapping.spec.js b/test/acceptance/date-wrapping.spec.js
index 665b8284..4247ff5e 100644
--- a/test/acceptance/date-wrapping.spec.js
+++ b/test/acceptance/date-wrapping.spec.js
@@ -1,3 +1,5 @@
+'use strict';
+
 /* eslint-env mocha */
 const assert = require('assert');
 const TestClient = require('../support/test-client');
@@ -316,5 +318,3 @@ describe_mvt('date-wrapping', () => {
     });
 
 });
-
-
diff --git a/test/acceptance/dynamic-styling-named-maps.js b/test/acceptance/dynamic-styling-named-maps.js
index ac483cf2..994e347f 100644
--- a/test/acceptance/dynamic-styling-named-maps.js
+++ b/test/acceptance/dynamic-styling-named-maps.js
@@ -1,3 +1,5 @@
+'use strict';
+
 var assert = require('../support/assert');
 var step = require('step');
 var LayergroupToken = require('../../lib/cartodb/models/layergroup-token');
diff --git a/test/acceptance/error-middleware.js b/test/acceptance/error-middleware.js
index 4df5b7e6..88211e09 100644
--- a/test/acceptance/error-middleware.js
+++ b/test/acceptance/error-middleware.js
@@ -1,3 +1,5 @@
+'use strict';
+
 const assert = require('../support/assert');
 const TestClient = require('../support/test-client');
 
diff --git a/test/acceptance/errors-with-context.js b/test/acceptance/errors-with-context.js
index 27440368..1adc877a 100644
--- a/test/acceptance/errors-with-context.js
+++ b/test/acceptance/errors-with-context.js
@@ -1,3 +1,5 @@
+'use strict';
+
 var assert = require('../support/assert');
 var CartodbWindshaft = require(__dirname + '/../../lib/cartodb/server');
 var serverOptions = require(__dirname + '/../../lib/cartodb/server_options');
diff --git a/test/acceptance/health_check.js b/test/acceptance/health_check.js
index 667feba4..112cc88d 100644
--- a/test/acceptance/health_check.js
+++ b/test/acceptance/health_check.js
@@ -1,3 +1,5 @@
+'use strict';
+
 require(__dirname + '/../support/test_helper');
 
 var fs = require('fs');
diff --git a/test/acceptance/label-wrap.js b/test/acceptance/label-wrap.js
index d4482b01..914b2842 100644
--- a/test/acceptance/label-wrap.js
+++ b/test/acceptance/label-wrap.js
@@ -1,3 +1,5 @@
+'use strict';
+
 require('../support/test_helper');
 var TestClient = require('../support/test-client');
 
@@ -7,10 +9,10 @@ var IMAGE_TOLERANCE = 5;
 describe('CartoCSS wrap', function () {
     const options = {
         sql: `
-            SELECT 
-                5 as cartodb_id, 
-                ST_Transform(ST_SetSRID(ST_MakePoint(-57.65625,-15.6230368),4326),3857) as the_geom_webmercator,  
-                ST_SetSRID(ST_MakePoint(-57.65625,-15.62303683),4326) as the_geom, 
+            SELECT
+                5 as cartodb_id,
+                ST_Transform(ST_SetSRID(ST_MakePoint(-57.65625,-15.6230368),4326),3857) as the_geom_webmercator,
+                ST_SetSRID(ST_MakePoint(-57.65625,-15.62303683),4326) as the_geom,
                 'South America' as continent
         `,
         cartocss: `
diff --git a/test/acceptance/layergroup-metadata.js b/test/acceptance/layergroup-metadata.js
index c3a109be..235a30ed 100644
--- a/test/acceptance/layergroup-metadata.js
+++ b/test/acceptance/layergroup-metadata.js
@@ -1,3 +1,5 @@
+'use strict';
+
 require('../support/test_helper');
 
 const assert = require('../support/assert');
diff --git a/test/acceptance/layers-filters.js b/test/acceptance/layers-filters.js
index fa42c900..2767300f 100644
--- a/test/acceptance/layers-filters.js
+++ b/test/acceptance/layers-filters.js
@@ -1,3 +1,5 @@
+'use strict';
+
 require('../support/test_helper');
 var TestClient = require('../support/test-client');
 
@@ -51,4 +53,4 @@ describe('layers filters', function() {
         });
     });
 
-});
\ No newline at end of file
+});
diff --git a/test/acceptance/multilayer.js b/test/acceptance/multilayer.js
index d818ae5b..1d9b2422 100644
--- a/test/acceptance/multilayer.js
+++ b/test/acceptance/multilayer.js
@@ -1,3 +1,5 @@
+'use strict';
+
 var assert      = require('../support/assert');
 var _           = require('underscore');
 var redis       = require('redis');
diff --git a/test/acceptance/multilayer_server.js b/test/acceptance/multilayer_server.js
index 309b96d8..f13c8f0a 100644
--- a/test/acceptance/multilayer_server.js
+++ b/test/acceptance/multilayer_server.js
@@ -1,3 +1,5 @@
+'use strict';
+
 var testHelper = require('../support/test_helper');
 
 var assert = require('../support/assert');
diff --git a/test/acceptance/mvt-regressions.js b/test/acceptance/mvt-regressions.js
index e8cab0a2..0d1c5023 100644
--- a/test/acceptance/mvt-regressions.js
+++ b/test/acceptance/mvt-regressions.js
@@ -1,3 +1,5 @@
+'use strict';
+
 require('../support/test_helper');
 
 const assert = require('../support/assert');
@@ -95,7 +97,7 @@ describe('MVT Mapnik', function () {
     it('invalid properties', function (done) {
         const query = `
             select ldc, cartodb_id, _2016_6_partcntry, the_geom_webmercator, country
-            from countries_null_values 
+            from countries_null_values
             where country = 'Kenya' OR country = 'Sudan' LIMIT 3
         `;
 
diff --git a/test/acceptance/mvt.js b/test/acceptance/mvt.js
index f1fd2c11..004a699b 100644
--- a/test/acceptance/mvt.js
+++ b/test/acceptance/mvt.js
@@ -1,3 +1,5 @@
+'use strict';
+
 require('../support/test_helper');
 
 var assert = require('../support/assert');
diff --git a/test/acceptance/named_layers.js b/test/acceptance/named_layers.js
index 0f8998e4..b80bfacc 100644
--- a/test/acceptance/named_layers.js
+++ b/test/acceptance/named_layers.js
@@ -1,3 +1,5 @@
+'use strict';
+
 var test_helper = require('../support/test_helper');
 
 var assert = require('../support/assert');
diff --git a/test/acceptance/named_layers_visibility.js b/test/acceptance/named_layers_visibility.js
index bc8e3f6b..0df92ed6 100644
--- a/test/acceptance/named_layers_visibility.js
+++ b/test/acceptance/named_layers_visibility.js
@@ -1,3 +1,5 @@
+'use strict';
+
 var step = require('step');
 var test_helper = require('../support/test_helper');
 
diff --git a/test/acceptance/named_maps_authentication.js b/test/acceptance/named_maps_authentication.js
index 00ac721e..4f8e343c 100644
--- a/test/acceptance/named_maps_authentication.js
+++ b/test/acceptance/named_maps_authentication.js
@@ -1,3 +1,5 @@
+'use strict';
+
 var test_helper = require('../support/test_helper');
 var RedisPool = require('redis-mpool');
 var querystring = require('querystring');
diff --git a/test/acceptance/named_maps_cache.js b/test/acceptance/named_maps_cache.js
index 6ebd05b1..44cfc84e 100644
--- a/test/acceptance/named_maps_cache.js
+++ b/test/acceptance/named_maps_cache.js
@@ -1,3 +1,5 @@
+'use strict';
+
 require('../support/test_helper');
 var RedisPool = require('redis-mpool');
 
diff --git a/test/acceptance/named_maps_static_view.js b/test/acceptance/named_maps_static_view.js
index 69c4e56c..a6283d61 100644
--- a/test/acceptance/named_maps_static_view.js
+++ b/test/acceptance/named_maps_static_view.js
@@ -1,3 +1,5 @@
+'use strict';
+
 var qs = require('querystring');
 var testHelper = require('../support/test_helper');
 var RedisPool = require('redis-mpool');
@@ -295,10 +297,10 @@ describe('named maps static view', function() {
             if (err) {
                 return done(err);
             }
-            
+
             var url = `/api/v1/map/static/named/${templateName}/640/480.gif`;
 
-            
+
             var requestOptions = {
                 url: url,
                 method: 'GET',
diff --git a/test/acceptance/named_maps_stats.js b/test/acceptance/named_maps_stats.js
index f585d059..fc80cbbc 100644
--- a/test/acceptance/named_maps_stats.js
+++ b/test/acceptance/named_maps_stats.js
@@ -1,3 +1,5 @@
+'use strict';
+
 var test_helper = require('../support/test_helper');
 var RedisPool = require('redis-mpool');
 var querystring = require('querystring');
diff --git a/test/acceptance/overviews_metadata.js b/test/acceptance/overviews_metadata.js
index a280e683..90642777 100644
--- a/test/acceptance/overviews_metadata.js
+++ b/test/acceptance/overviews_metadata.js
@@ -1,3 +1,5 @@
+'use strict';
+
 var test_helper = require('../support/test_helper');
 
 var assert = require('../support/assert');
diff --git a/test/acceptance/overviews_metadata_named_maps.js b/test/acceptance/overviews_metadata_named_maps.js
index dd72f240..9e66cf07 100644
--- a/test/acceptance/overviews_metadata_named_maps.js
+++ b/test/acceptance/overviews_metadata_named_maps.js
@@ -1,3 +1,5 @@
+'use strict';
+
 var test_helper = require('../support/test_helper');
 
 var assert = require('../support/assert');
diff --git a/test/acceptance/overviews_queries.js b/test/acceptance/overviews_queries.js
index 6fdf7d62..c3726a61 100644
--- a/test/acceptance/overviews_queries.js
+++ b/test/acceptance/overviews_queries.js
@@ -1,3 +1,5 @@
+'use strict';
+
 var testHelper = require('../support/test_helper');
 var assert = require('../support/assert');
 
diff --git a/test/acceptance/ported/attributes.js b/test/acceptance/ported/attributes.js
index ba241a4f..c5b97f5c 100644
--- a/test/acceptance/ported/attributes.js
+++ b/test/acceptance/ported/attributes.js
@@ -1,3 +1,5 @@
+'use strict';
+
 var testHelper = require('../../support/test_helper');
 
 var assert = require('../../support/assert');
diff --git a/test/acceptance/ported/blend.js b/test/acceptance/ported/blend.js
index 52273568..2f4a8714 100644
--- a/test/acceptance/ported/blend.js
+++ b/test/acceptance/ported/blend.js
@@ -1,3 +1,5 @@
+'use strict';
+
 require('../../support/test_helper');
 
 var assert = require('../../support/assert');
diff --git a/test/acceptance/ported/blend_filtering.js b/test/acceptance/ported/blend_filtering.js
index 2ada716e..fcb0d41f 100644
--- a/test/acceptance/ported/blend_filtering.js
+++ b/test/acceptance/ported/blend_filtering.js
@@ -1,3 +1,5 @@
+'use strict';
+
 require('../../support/test_helper');
 
 var assert = require('../../support/assert');
diff --git a/test/acceptance/ported/blend_http_fallback.js b/test/acceptance/ported/blend_http_fallback.js
index f86d3dfc..13fac245 100644
--- a/test/acceptance/ported/blend_http_fallback.js
+++ b/test/acceptance/ported/blend_http_fallback.js
@@ -1,3 +1,5 @@
+'use strict';
+
 require('../../support/test_helper');
 
 var assert = require('../../support/assert');
diff --git a/test/acceptance/ported/blend_http_timeout.js b/test/acceptance/ported/blend_http_timeout.js
index 54481fd0..7edd8996 100644
--- a/test/acceptance/ported/blend_http_timeout.js
+++ b/test/acceptance/ported/blend_http_timeout.js
@@ -1,3 +1,5 @@
+'use strict';
+
 require('../../support/test_helper');
 
 var assert = require('../../support/assert');
diff --git a/test/acceptance/ported/external_resources.js b/test/acceptance/ported/external_resources.js
index 5791a640..6f4f13b3 100644
--- a/test/acceptance/ported/external_resources.js
+++ b/test/acceptance/ported/external_resources.js
@@ -1,3 +1,5 @@
+'use strict';
+
 var testHelper = require('../../support/test_helper');
 
 var assert = require('../../support/assert');
diff --git a/test/acceptance/ported/limits.js b/test/acceptance/ported/limits.js
index 0a8ee378..ea549fa3 100644
--- a/test/acceptance/ported/limits.js
+++ b/test/acceptance/ported/limits.js
@@ -1,3 +1,5 @@
+'use strict';
+
 require('../../support/test_helper');
 
 var fs = require('fs');
diff --git a/test/acceptance/ported/multilayer.js b/test/acceptance/ported/multilayer.js
index 0f43af8d..5dd7ebbb 100644
--- a/test/acceptance/ported/multilayer.js
+++ b/test/acceptance/ported/multilayer.js
@@ -1,3 +1,5 @@
+'use strict';
+
 var testHelper = require('../../support/test_helper');
 
 var assert = require('../../support/assert');
diff --git a/test/acceptance/ported/multilayer_error_cases.js b/test/acceptance/ported/multilayer_error_cases.js
index dcd52f6d..6194879b 100644
--- a/test/acceptance/ported/multilayer_error_cases.js
+++ b/test/acceptance/ported/multilayer_error_cases.js
@@ -1,3 +1,5 @@
+'use strict';
+
 require('../../support/test_helper');
 
 var assert = require('../../support/assert');
diff --git a/test/acceptance/ported/multilayer_interactivity.js b/test/acceptance/ported/multilayer_interactivity.js
index 1e46e512..c2c11fad 100644
--- a/test/acceptance/ported/multilayer_interactivity.js
+++ b/test/acceptance/ported/multilayer_interactivity.js
@@ -1,3 +1,5 @@
+'use strict';
+
 var testHelper = require('../../support/test_helper');
 
 var assert = require('../../support/assert');
diff --git a/test/acceptance/ported/raster.js b/test/acceptance/ported/raster.js
index 349d4a07..04cf020a 100644
--- a/test/acceptance/ported/raster.js
+++ b/test/acceptance/ported/raster.js
@@ -1,3 +1,5 @@
+'use strict';
+
 var testHelper =require('../../support/test_helper');
 
 var assert = require('../../support/assert');
diff --git a/test/acceptance/ported/regressions.js b/test/acceptance/ported/regressions.js
index 71fd8388..5e6a6293 100644
--- a/test/acceptance/ported/regressions.js
+++ b/test/acceptance/ported/regressions.js
@@ -1,3 +1,5 @@
+'use strict';
+
 var testHelper = require('../../support/test_helper');
 
 var assert = require('../../support/assert');
diff --git a/test/acceptance/ported/retina.js b/test/acceptance/ported/retina.js
index a5c29416..bdc1188c 100644
--- a/test/acceptance/ported/retina.js
+++ b/test/acceptance/ported/retina.js
@@ -1,3 +1,5 @@
+'use strict';
+
 var testHelper = require('../../support/test_helper');
 
 var assert = require('../../support/assert');
diff --git a/test/acceptance/ported/server.js b/test/acceptance/ported/server.js
index a38b4da7..58febf38 100644
--- a/test/acceptance/ported/server.js
+++ b/test/acceptance/ported/server.js
@@ -1,3 +1,5 @@
+'use strict';
+
 var testHelper = require('../../support/test_helper');
 
 var assert = require('../../support/assert');
diff --git a/test/acceptance/ported/server_gettile.js b/test/acceptance/ported/server_gettile.js
index b83a9720..61daa568 100644
--- a/test/acceptance/ported/server_gettile.js
+++ b/test/acceptance/ported/server_gettile.js
@@ -1,3 +1,5 @@
+'use strict';
+
 var testHelper = require('../../support/test_helper');
 
 var assert = require('../../support/assert');
diff --git a/test/acceptance/ported/server_png8_format.js b/test/acceptance/ported/server_png8_format.js
index c2703994..86af4682 100644
--- a/test/acceptance/ported/server_png8_format.js
+++ b/test/acceptance/ported/server_png8_format.js
@@ -1,3 +1,5 @@
+'use strict';
+
 var testHelper = require('../../support/test_helper');
 
 var assert = require('../../support/assert');
diff --git a/test/acceptance/ported/static_maps.js b/test/acceptance/ported/static_maps.js
index 1002cdd5..ce3721f0 100644
--- a/test/acceptance/ported/static_maps.js
+++ b/test/acceptance/ported/static_maps.js
@@ -1,3 +1,5 @@
+'use strict';
+
 require('../../support/test_helper');
 
 var assert = require('../../support/assert');
diff --git a/test/acceptance/ported/support/ported_server_options.js b/test/acceptance/ported/support/ported_server_options.js
index 243875a0..b0fddbe2 100644
--- a/test/acceptance/ported/support/ported_server_options.js
+++ b/test/acceptance/ported/support/ported_server_options.js
@@ -1,3 +1,5 @@
+'use strict';
+
 var _ = require('underscore');
 var serverOptions = require('../../../../lib/cartodb/server_options');
 var mapnik = require('windshaft').mapnik;
diff --git a/test/acceptance/ported/support/test_client.js b/test/acceptance/ported/support/test_client.js
index 51caab6d..01d00bf2 100644
--- a/test/acceptance/ported/support/test_client.js
+++ b/test/acceptance/ported/support/test_client.js
@@ -1,3 +1,5 @@
+'use strict';
+
 var testHelper = require('../../../support/test_helper');
 var LayergroupToken = require('../../../../lib/cartodb/models/layergroup-token');
 
diff --git a/test/acceptance/ported/torque.js b/test/acceptance/ported/torque.js
index c60f62d9..d5fd73be 100644
--- a/test/acceptance/ported/torque.js
+++ b/test/acceptance/ported/torque.js
@@ -1,3 +1,5 @@
+'use strict';
+
 var testHelper = require('../../support/test_helper');
 
 var assert = require('../../support/assert');
diff --git a/test/acceptance/ported/torque_boundaries.js b/test/acceptance/ported/torque_boundaries.js
index 9ae1face..1f0fcd80 100644
--- a/test/acceptance/ported/torque_boundaries.js
+++ b/test/acceptance/ported/torque_boundaries.js
@@ -1,3 +1,5 @@
+'use strict';
+
 var testHelper = require('../../support/test_helper');
 
 var assert = require('../../support/assert');
diff --git a/test/acceptance/ported/torque_png.js b/test/acceptance/ported/torque_png.js
index 57b3ffa1..9c8480bd 100644
--- a/test/acceptance/ported/torque_png.js
+++ b/test/acceptance/ported/torque_png.js
@@ -1,3 +1,5 @@
+'use strict';
+
 require('../../support/test_helper');
 
 var assert = require('../../support/assert');
diff --git a/test/acceptance/ported/torque_zero_zero.js b/test/acceptance/ported/torque_zero_zero.js
index 30ff14a0..2d81f517 100644
--- a/test/acceptance/ported/torque_zero_zero.js
+++ b/test/acceptance/ported/torque_zero_zero.js
@@ -1,3 +1,5 @@
+'use strict';
+
 require('../../support/test_helper');
 
 var assert = require('../../support/assert');
diff --git a/test/acceptance/ported/wrap.js b/test/acceptance/ported/wrap.js
index d79e2b56..6434d6fa 100644
--- a/test/acceptance/ported/wrap.js
+++ b/test/acceptance/ported/wrap.js
@@ -1,3 +1,5 @@
+'use strict';
+
 require('../../support/test_helper');
 
 var assert = require('../../support/assert');
diff --git a/test/acceptance/rate-limit.test.js b/test/acceptance/rate-limit.test.js
index 2dd478ba..9fc6b641 100644
--- a/test/acceptance/rate-limit.test.js
+++ b/test/acceptance/rate-limit.test.js
@@ -1,3 +1,5 @@
+'use strict';
+
 require('../support/test_helper');
 
 const assert = require('../support/assert');
diff --git a/test/acceptance/regressions.js b/test/acceptance/regressions.js
index e329f5c8..21d9c970 100644
--- a/test/acceptance/regressions.js
+++ b/test/acceptance/regressions.js
@@ -1,3 +1,5 @@
+'use strict';
+
 require('../support/test_helper');
 var assert = require('../support/assert');
 const helper = require('../support/test_helper');
diff --git a/test/acceptance/server.js b/test/acceptance/server.js
index 7e917b09..183d6bac 100644
--- a/test/acceptance/server.js
+++ b/test/acceptance/server.js
@@ -1,3 +1,5 @@
+'use strict';
+
 require('../support/test_helper');
 
 var assert      = require('../support/assert');
diff --git a/test/acceptance/special-numeric-values.js b/test/acceptance/special-numeric-values.js
index 2b596b8e..6b328286 100644
--- a/test/acceptance/special-numeric-values.js
+++ b/test/acceptance/special-numeric-values.js
@@ -1,3 +1,5 @@
+'use strict';
+
 require('../support/test_helper');
 
 var assert = require('../support/assert');
@@ -68,4 +70,3 @@ describe('special numeric values', function() {
         });
     });
 });
-
diff --git a/test/acceptance/sql-wrap.js b/test/acceptance/sql-wrap.js
index 7b3c25d8..7b2f9d57 100644
--- a/test/acceptance/sql-wrap.js
+++ b/test/acceptance/sql-wrap.js
@@ -1,3 +1,5 @@
+'use strict';
+
 require('../support/test_helper');
 
 var assert = require('../support/assert');
diff --git a/test/acceptance/stats/mapnik_stats_layergroup.js b/test/acceptance/stats/mapnik_stats_layergroup.js
index 189b42e9..8f73e5a2 100644
--- a/test/acceptance/stats/mapnik_stats_layergroup.js
+++ b/test/acceptance/stats/mapnik_stats_layergroup.js
@@ -1,3 +1,5 @@
+'use strict';
+
 require('../../support/test_helper');
 
 var assert = require('../../support/assert');
diff --git a/test/acceptance/stats/multilayer_stats.js b/test/acceptance/stats/multilayer_stats.js
index ced63b0e..dcf9b402 100644
--- a/test/acceptance/stats/multilayer_stats.js
+++ b/test/acceptance/stats/multilayer_stats.js
@@ -1,3 +1,5 @@
+'use strict';
+
 require('../../support/test_helper');
 
 var assert = require('../../support/assert');
diff --git a/test/acceptance/templates.js b/test/acceptance/templates.js
index faea283e..46e5aae6 100644
--- a/test/acceptance/templates.js
+++ b/test/acceptance/templates.js
@@ -1,3 +1,5 @@
+'use strict';
+
 var assert      = require('../support/assert');
 var _           = require('underscore');
 var redis       = require('redis');
diff --git a/test/acceptance/tilejson.js b/test/acceptance/tilejson.js
index 0230b715..d71865e9 100644
--- a/test/acceptance/tilejson.js
+++ b/test/acceptance/tilejson.js
@@ -1,3 +1,5 @@
+'use strict';
+
 require('../support/test_helper');
 
 const assert = require('../support/assert');
diff --git a/test/acceptance/turbo-carto/anonymous-maps.js b/test/acceptance/turbo-carto/anonymous-maps.js
index a57bf4a7..80680192 100644
--- a/test/acceptance/turbo-carto/anonymous-maps.js
+++ b/test/acceptance/turbo-carto/anonymous-maps.js
@@ -1,3 +1,5 @@
+'use strict';
+
 var assert = require('../../support/assert');
 var TestClient = require('../../support/test-client');
 
diff --git a/test/acceptance/turbo-carto/error-cases.js b/test/acceptance/turbo-carto/error-cases.js
index b6424c72..94b07fe0 100644
--- a/test/acceptance/turbo-carto/error-cases.js
+++ b/test/acceptance/turbo-carto/error-cases.js
@@ -1,3 +1,5 @@
+'use strict';
+
 require('../../support/test_helper');
 
 var assert = require('../../support/assert');
diff --git a/test/acceptance/turbo-carto/named-maps.js b/test/acceptance/turbo-carto/named-maps.js
index 1a740418..6a302498 100644
--- a/test/acceptance/turbo-carto/named-maps.js
+++ b/test/acceptance/turbo-carto/named-maps.js
@@ -1,3 +1,5 @@
+'use strict';
+
 var assert = require('../../support/assert');
 var step = require('step');
 var LayergroupToken = require('../../../lib/cartodb/models/layergroup-token');
diff --git a/test/acceptance/turbo-carto/regressions.js b/test/acceptance/turbo-carto/regressions.js
index 8e3822de..40dec6de 100644
--- a/test/acceptance/turbo-carto/regressions.js
+++ b/test/acceptance/turbo-carto/regressions.js
@@ -1,3 +1,5 @@
+'use strict';
+
 require('../../support/test_helper');
 
 var assert = require('../../support/assert');
@@ -470,7 +472,7 @@ describe('turbo-carto regressions', function() {
                     done();
                 });
             });
-        });        
+        });
 
         function makeMapconfig({numQuantiles = 1}) {
             return {
@@ -481,10 +483,10 @@ describe('turbo-carto regressions', function() {
                         "options": {
                             "cartocss_version": '2.3.0',
                             "sql": 'SELECT * FROM populated_places_simple_reduced',
-                            "cartocss": `#layer {\n  
-                                        marker-width: ramp([labelrank], range(1, 20), quantiles(${numQuantiles}));\n  
-                                        marker-fill: #EE4D5A;\n  marker-fill-opacity: 0.9;\n  
-                                        marker-allow-overlap: true;\n  marker-line-width: 1;\n  
+                            "cartocss": `#layer {\n
+                                        marker-width: ramp([labelrank], range(1, 20), quantiles(${numQuantiles}));\n
+                                        marker-fill: #EE4D5A;\n  marker-fill-opacity: 0.9;\n
+                                        marker-allow-overlap: true;\n  marker-line-width: 1;\n
                                         marker-line-color: #FFFFFF;\n  marker-line-opacity: 1;\n}`,
                         }
                     }
diff --git a/test/acceptance/user-database-timeout-limit.js b/test/acceptance/user-database-timeout-limit.js
index 1a2a505c..8bb2f069 100644
--- a/test/acceptance/user-database-timeout-limit.js
+++ b/test/acceptance/user-database-timeout-limit.js
@@ -1,3 +1,5 @@
+'use strict';
+
 require('../support/test_helper');
 
 const assert = require('../support/assert');
diff --git a/test/acceptance/user-render-timeout-limit.js b/test/acceptance/user-render-timeout-limit.js
index 1a5b7c98..b5722dcf 100644
--- a/test/acceptance/user-render-timeout-limit.js
+++ b/test/acceptance/user-render-timeout-limit.js
@@ -1,3 +1,5 @@
+'use strict';
+
 require('../support/test_helper');
 
 const assert = require('../support/assert');
diff --git a/test/acceptance/vector-layergroup.js b/test/acceptance/vector-layergroup.js
index d27fd874..d12e8e07 100644
--- a/test/acceptance/vector-layergroup.js
+++ b/test/acceptance/vector-layergroup.js
@@ -1,3 +1,5 @@
+'use strict';
+
 require('../support/test_helper');
 
 const assert = require('../support/assert');
diff --git a/test/acceptance/widgets/aggregation.js b/test/acceptance/widgets/aggregation.js
index 0b58fb65..8977ef19 100644
--- a/test/acceptance/widgets/aggregation.js
+++ b/test/acceptance/widgets/aggregation.js
@@ -1,3 +1,5 @@
+'use strict';
+
 require('../../support/test_helper');
 
 var assert = require('../../support/assert');
diff --git a/test/acceptance/widgets/histogram.js b/test/acceptance/widgets/histogram.js
index a5b7a642..503218e9 100644
--- a/test/acceptance/widgets/histogram.js
+++ b/test/acceptance/widgets/histogram.js
@@ -1,3 +1,5 @@
+'use strict';
+
 require('../../support/test_helper');
 
 var assert = require('../../support/assert');
diff --git a/test/acceptance/widgets/named-maps.js b/test/acceptance/widgets/named-maps.js
index f0ca0125..ab136dc0 100644
--- a/test/acceptance/widgets/named-maps.js
+++ b/test/acceptance/widgets/named-maps.js
@@ -1,3 +1,5 @@
+'use strict';
+
 var assert = require('../../support/assert');
 var step = require('step');
 
diff --git a/test/acceptance/widgets/ported/aggregation.js b/test/acceptance/widgets/ported/aggregation.js
index 62c998a5..2f36d3bb 100644
--- a/test/acceptance/widgets/ported/aggregation.js
+++ b/test/acceptance/widgets/ported/aggregation.js
@@ -1,3 +1,5 @@
+'use strict';
+
 require('../../../support/test_helper');
 
 var assert = require('../../../support/assert');
diff --git a/test/acceptance/widgets/ported/formula.js b/test/acceptance/widgets/ported/formula.js
index 17d5c287..c3ca2bc6 100644
--- a/test/acceptance/widgets/ported/formula.js
+++ b/test/acceptance/widgets/ported/formula.js
@@ -1,3 +1,5 @@
+'use strict';
+
 require('../../../support/test_helper');
 
 var assert        = require('../../../support/assert');
diff --git a/test/acceptance/widgets/ported/histogram.js b/test/acceptance/widgets/ported/histogram.js
index 90dfe840..510feb9e 100644
--- a/test/acceptance/widgets/ported/histogram.js
+++ b/test/acceptance/widgets/ported/histogram.js
@@ -1,3 +1,5 @@
+'use strict';
+
 require('../../../support/test_helper');
 
 var assert        = require('../../../support/assert');
diff --git a/test/acceptance/widgets/regressions.js b/test/acceptance/widgets/regressions.js
index 0c338265..755e2a96 100644
--- a/test/acceptance/widgets/regressions.js
+++ b/test/acceptance/widgets/regressions.js
@@ -1,3 +1,5 @@
+'use strict';
+
 require('../../support/test_helper');
 
 var assert = require('../../support/assert');
@@ -260,7 +262,7 @@ describe('widgets-regressions', function() {
                 ]]
             };
 
-            const query = `  
+            const query = `
                 SELECT
                     ST_TRANSFORM(ST_SETSRID(ST_GeomFromGeoJSON(
                         '${JSON.stringify(notIntersectingLeftTriangle)}'
diff --git a/test/acceptance/widgets/widgets.js b/test/acceptance/widgets/widgets.js
index 6fee7a29..94ecb0a2 100644
--- a/test/acceptance/widgets/widgets.js
+++ b/test/acceptance/widgets/widgets.js
@@ -1,3 +1,5 @@
+'use strict';
+
 require('../../support/test_helper');
 
 var assert = require('../../support/assert');
diff --git a/test/integration/analysis-backend-limits.js b/test/integration/analysis-backend-limits.js
index 720bdd30..21e7d9cc 100644
--- a/test/integration/analysis-backend-limits.js
+++ b/test/integration/analysis-backend-limits.js
@@ -1,3 +1,5 @@
+'use strict';
+
 var testHelper = require('../support/test_helper');
 
 var assert = require('assert');
diff --git a/test/integration/mapconfig_named_layers_datasource.js b/test/integration/mapconfig_named_layers_datasource.js
index 48f0b65d..d3eefd28 100644
--- a/test/integration/mapconfig_named_layers_datasource.js
+++ b/test/integration/mapconfig_named_layers_datasource.js
@@ -1,3 +1,5 @@
+'use strict';
+
 require('../support/test_helper');
 
 var assert = require('assert');
diff --git a/test/integration/mapconfig_named_layers_expanded.js b/test/integration/mapconfig_named_layers_expanded.js
index fd542514..ea3a34a4 100644
--- a/test/integration/mapconfig_named_layers_expanded.js
+++ b/test/integration/mapconfig_named_layers_expanded.js
@@ -1,3 +1,5 @@
+'use strict';
+
 require('../support/test_helper');
 
 var assert = require('assert');
diff --git a/test/integration/mapconfig_overviews_adapter.js b/test/integration/mapconfig_overviews_adapter.js
index d5414a7e..64a2d0c9 100644
--- a/test/integration/mapconfig_overviews_adapter.js
+++ b/test/integration/mapconfig_overviews_adapter.js
@@ -1,3 +1,5 @@
+'use strict';
+
 require('../support/test_helper');
 
 var assert = require('assert');
diff --git a/test/integration/overviews-metadata-api.js b/test/integration/overviews-metadata-api.js
index ce82a1d9..c3e241ec 100644
--- a/test/integration/overviews-metadata-api.js
+++ b/test/integration/overviews-metadata-api.js
@@ -1,3 +1,5 @@
+'use strict';
+
 require('../support/test_helper');
 
 var assert = require('assert');
diff --git a/test/integration/pg-query-runner.js b/test/integration/pg-query-runner.js
index 9cb9fcbe..a979ee81 100644
--- a/test/integration/pg-query-runner.js
+++ b/test/integration/pg-query-runner.js
@@ -1,3 +1,5 @@
+'use strict';
+
 require('../support/test_helper');
 
 var assert = require('assert');
diff --git a/test/integration/profiler.js b/test/integration/profiler.js
index 496a9d72..4bc7ee0e 100644
--- a/test/integration/profiler.js
+++ b/test/integration/profiler.js
@@ -1,3 +1,5 @@
+'use strict';
+
 require('../support/test_helper');
 
 var assert = require('assert');
diff --git a/test/integration/query-tables.js b/test/integration/query-tables.js
index 9cd76000..6ce50ce7 100644
--- a/test/integration/query-tables.js
+++ b/test/integration/query-tables.js
@@ -1,3 +1,5 @@
+'use strict';
+
 require('../support/test_helper');
 
 var assert = require('assert');
@@ -68,4 +70,4 @@ describe('QueryTables', function() {
         });
     });
 
-});
\ No newline at end of file
+});
diff --git a/test/integration/template-maps-limits.js b/test/integration/template-maps-limits.js
index 12150c68..37f3ca9f 100644
--- a/test/integration/template-maps-limits.js
+++ b/test/integration/template-maps-limits.js
@@ -1,3 +1,5 @@
+'use strict';
+
 require('../support/test_helper');
 
 var assert = require('assert');
diff --git a/test/support/assert.js b/test/support/assert.js
index 89620fac..3c503243 100644
--- a/test/support/assert.js
+++ b/test/support/assert.js
@@ -1,3 +1,5 @@
+'use strict';
+
 // Cribbed from the ever prolific Konstantin Kaefer
 // https://github.com/mapbox/tilelive-mapnik/blob/master/test/support/assert.js
 
diff --git a/test/support/test_helper.js b/test/support/test_helper.js
index 5770a42f..55fad97a 100644
--- a/test/support/test_helper.js
+++ b/test/support/test_helper.js
@@ -1,3 +1,5 @@
+'use strict';
+
 /**
  * User: simon
  * Date: 30/08/2011
diff --git a/test/unit/cartodb/backends/layer-stats/mapnik-layer-stats.js b/test/unit/cartodb/backends/layer-stats/mapnik-layer-stats.js
index 6e47297d..874fba28 100644
--- a/test/unit/cartodb/backends/layer-stats/mapnik-layer-stats.js
+++ b/test/unit/cartodb/backends/layer-stats/mapnik-layer-stats.js
@@ -1,3 +1,5 @@
+'use strict';
+
 var assert = require('assert');
 var MapnikLayerStats = require('../../../../../lib/cartodb/backends/layer-stats/mapnik-layer-stats');
 var MapConfig = require('windshaft').model.MapConfig;
diff --git a/test/unit/cartodb/backends/layer-stats/torque-layer-stats.js b/test/unit/cartodb/backends/layer-stats/torque-layer-stats.js
index c9adfad9..c00260c8 100644
--- a/test/unit/cartodb/backends/layer-stats/torque-layer-stats.js
+++ b/test/unit/cartodb/backends/layer-stats/torque-layer-stats.js
@@ -1,3 +1,5 @@
+'use strict';
+
 var assert = require('assert');
 var TorqueLayerStats = require('../../../../../lib/cartodb/backends/layer-stats/torque-layer-stats');
 var MapConfig = require('windshaft').model.MapConfig;
diff --git a/test/unit/cartodb/backends/turbo-carto-postgres-datasource.js b/test/unit/cartodb/backends/turbo-carto-postgres-datasource.js
index 7e774023..861f51d8 100644
--- a/test/unit/cartodb/backends/turbo-carto-postgres-datasource.js
+++ b/test/unit/cartodb/backends/turbo-carto-postgres-datasource.js
@@ -1,3 +1,5 @@
+'use strict';
+
 var PostgresDatasource = require('../../../../lib/cartodb/backends/turbo-carto-postgres-datasource');
 var PSQL = require('cartodb-psql');
 var _ = require('underscore');
diff --git a/test/unit/cartodb/cache/model/named_maps_entry.test.js b/test/unit/cartodb/cache/model/named_maps_entry.test.js
index abaef82f..335f30c7 100644
--- a/test/unit/cartodb/cache/model/named_maps_entry.test.js
+++ b/test/unit/cartodb/cache/model/named_maps_entry.test.js
@@ -1,3 +1,5 @@
+'use strict';
+
 require('../../../../support/test_helper');
 
 var assert = require('assert');
diff --git a/test/unit/cartodb/cdb_request.test.js b/test/unit/cartodb/cdb_request.test.js
index 2d89d25c..0dbf35a3 100644
--- a/test/unit/cartodb/cdb_request.test.js
+++ b/test/unit/cartodb/cdb_request.test.js
@@ -1,3 +1,5 @@
+'use strict';
+
 require('../../support/test_helper');
 var assert = require('assert');
 
diff --git a/test/unit/cartodb/error-middleware.test.js b/test/unit/cartodb/error-middleware.test.js
index 88b1ed6e..1f17ed9c 100644
--- a/test/unit/cartodb/error-middleware.test.js
+++ b/test/unit/cartodb/error-middleware.test.js
@@ -1,3 +1,5 @@
+'use strict';
+
 require('../../support/test_helper.js');
 
 var assert = require('assert');
diff --git a/test/unit/cartodb/error_messages.test.js b/test/unit/cartodb/error_messages.test.js
index ecc6fe3c..13ea1661 100644
--- a/test/unit/cartodb/error_messages.test.js
+++ b/test/unit/cartodb/error_messages.test.js
@@ -1,3 +1,5 @@
+'use strict';
+
 require('../../support/test_helper');
 
 var assert = require('assert');
diff --git a/test/unit/cartodb/lzmaMiddleware.test.js b/test/unit/cartodb/lzmaMiddleware.test.js
index 9701d7ca..4dc355fb 100644
--- a/test/unit/cartodb/lzmaMiddleware.test.js
+++ b/test/unit/cartodb/lzmaMiddleware.test.js
@@ -1,3 +1,5 @@
+'use strict';
+
 var assert = require('assert');
 var testHelper = require('../../support/test_helper');
 
diff --git a/test/unit/cartodb/mapconfig/adapter.test.js b/test/unit/cartodb/mapconfig/adapter.test.js
index eeb71896..d2832c78 100644
--- a/test/unit/cartodb/mapconfig/adapter.test.js
+++ b/test/unit/cartodb/mapconfig/adapter.test.js
@@ -1,3 +1,5 @@
+'use strict';
+
 //require('../../../support/test_helper');
 var assert = require('assert');
 
diff --git a/test/unit/cartodb/mapconfig/dataviews-widgets-adapter.test.js b/test/unit/cartodb/mapconfig/dataviews-widgets-adapter.test.js
index b78d8a85..58eaa709 100644
--- a/test/unit/cartodb/mapconfig/dataviews-widgets-adapter.test.js
+++ b/test/unit/cartodb/mapconfig/dataviews-widgets-adapter.test.js
@@ -1,3 +1,5 @@
+'use strict';
+
 //require('../../../support/test_helper');
 var assert = require('assert');
 
diff --git a/test/unit/cartodb/middlewares/coordinates.test.js b/test/unit/cartodb/middlewares/coordinates.test.js
index 5b60aa82..f6c39d88 100644
--- a/test/unit/cartodb/middlewares/coordinates.test.js
+++ b/test/unit/cartodb/middlewares/coordinates.test.js
@@ -1,3 +1,5 @@
+'use strict';
+
 const assert = require('assert');
 const coordinates = require('../../../../lib/cartodb/api/middlewares/coordinates');
 
diff --git a/test/unit/cartodb/model/filter/bbox-filters.test.js b/test/unit/cartodb/model/filter/bbox-filters.test.js
index 68327a7a..a0e7a14b 100644
--- a/test/unit/cartodb/model/filter/bbox-filters.test.js
+++ b/test/unit/cartodb/model/filter/bbox-filters.test.js
@@ -1,3 +1,5 @@
+'use strict';
+
 require('../../../../support/test_helper');
 var util = require('util');
 
diff --git a/test/unit/cartodb/model/resource-locator.test.js b/test/unit/cartodb/model/resource-locator.test.js
index 13ad5203..e9571c3e 100644
--- a/test/unit/cartodb/model/resource-locator.test.js
+++ b/test/unit/cartodb/model/resource-locator.test.js
@@ -1,3 +1,5 @@
+'use strict';
+
 require('../../../support/test_helper');
 
 var assert = require('../../../support/assert');
diff --git a/test/unit/cartodb/overviews_query_rewriter.js b/test/unit/cartodb/overviews_query_rewriter.js
index c224fed8..a3d07e4c 100644
--- a/test/unit/cartodb/overviews_query_rewriter.js
+++ b/test/unit/cartodb/overviews_query_rewriter.js
@@ -1,3 +1,5 @@
+'use strict';
+
 require('../../support/test_helper');
 
 var assert           = require('assert');
diff --git a/test/unit/cartodb/ported/profiler.test.js b/test/unit/cartodb/ported/profiler.test.js
index 29d9b485..d9bc775e 100644
--- a/test/unit/cartodb/ported/profiler.test.js
+++ b/test/unit/cartodb/ported/profiler.test.js
@@ -1,3 +1,5 @@
+'use strict';
+
 require('../../../support/test_helper');
 
 var assert = require('assert');
diff --git a/test/unit/cartodb/ported/stats_client.test.js b/test/unit/cartodb/ported/stats_client.test.js
index 088206a0..230d8b25 100644
--- a/test/unit/cartodb/ported/stats_client.test.js
+++ b/test/unit/cartodb/ported/stats_client.test.js
@@ -1,3 +1,5 @@
+'use strict';
+
 require('../../../support/test_helper');
 
 var assert = require('assert');
diff --git a/test/unit/cartodb/ported/windshaft_server.test.js b/test/unit/cartodb/ported/windshaft_server.test.js
index 2bc1423c..1591dc45 100644
--- a/test/unit/cartodb/ported/windshaft_server.test.js
+++ b/test/unit/cartodb/ported/windshaft_server.test.js
@@ -1,3 +1,5 @@
+'use strict';
+
 require('../../../support/test_helper.js');
 
 var assert = require('assert');
diff --git a/test/unit/cartodb/prepare-context.test.js b/test/unit/cartodb/prepare-context.test.js
index 02b63dc7..5de8a677 100644
--- a/test/unit/cartodb/prepare-context.test.js
+++ b/test/unit/cartodb/prepare-context.test.js
@@ -1,3 +1,5 @@
+'use strict';
+
 var assert = require('assert');
 var _ = require('underscore');
 
diff --git a/test/unit/cartodb/substitution-tokens.test.js b/test/unit/cartodb/substitution-tokens.test.js
index 70c3a0d0..61b78e39 100644
--- a/test/unit/cartodb/substitution-tokens.test.js
+++ b/test/unit/cartodb/substitution-tokens.test.js
@@ -1,3 +1,5 @@
+'use strict';
+
 var assert = require('assert');
 var SubstitutionTokens = require('../../../lib/cartodb/utils/substitution-tokens');
 
diff --git a/test/unit/cartodb/table_name_parser.js b/test/unit/cartodb/table_name_parser.js
index c08ebd8a..3c7aac48 100644
--- a/test/unit/cartodb/table_name_parser.js
+++ b/test/unit/cartodb/table_name_parser.js
@@ -1,3 +1,5 @@
+'use strict';
+
 require('../../support/test_helper');
 
 var assert        = require('assert');
diff --git a/test/unit/cartodb/template_maps.test.js b/test/unit/cartodb/template_maps.test.js
index 78dcfd38..d504dc2d 100644
--- a/test/unit/cartodb/template_maps.test.js
+++ b/test/unit/cartodb/template_maps.test.js
@@ -1,3 +1,5 @@
+'use strict';
+
 var testHelper = require('../../support/test_helper');
 
 var assert = require('assert');
diff --git a/test/unit/cartodb/template_maps_auth.test.js b/test/unit/cartodb/template_maps_auth.test.js
index 5cf145ae..9497adde 100644
--- a/test/unit/cartodb/template_maps_auth.test.js
+++ b/test/unit/cartodb/template_maps_auth.test.js
@@ -1,3 +1,5 @@
+'use strict';
+
 require('../../support/test_helper');
 
 var assert = require('assert');
diff --git a/test/unit/cartodb/template_maps_defaults.test.js b/test/unit/cartodb/template_maps_defaults.test.js
index bd61641c..dc612cd5 100644
--- a/test/unit/cartodb/template_maps_defaults.test.js
+++ b/test/unit/cartodb/template_maps_defaults.test.js
@@ -1,3 +1,5 @@
+'use strict';
+
 require('../../support/test_helper');
 
 var assert = require('assert');
diff --git a/test/unit/cartodb/utils/date-wrapper.test.js b/test/unit/cartodb/utils/date-wrapper.test.js
index e4fab99a..0ef7c126 100644
--- a/test/unit/cartodb/utils/date-wrapper.test.js
+++ b/test/unit/cartodb/utils/date-wrapper.test.js
@@ -1,3 +1,5 @@
+'use strict';
+
 var assert = require('assert');
 var dateWrapper = require('../../../../lib/cartodb/utils/date-wrapper');
 
diff --git a/test/unit/cartodb/valid_template_maps.test.js b/test/unit/cartodb/valid_template_maps.test.js
index 7c3327d5..c9a90b2c 100644
--- a/test/unit/cartodb/valid_template_maps.test.js
+++ b/test/unit/cartodb/valid_template_maps.test.js
@@ -1,3 +1,5 @@
+'use strict';
+
 require('../../support/test_helper');
 
 var assert = require('assert');
diff --git a/yarn.lock b/yarn.lock
index 70866a4b..8164448c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -14,9 +14,9 @@
     nan "2.10.0"
     node-pre-gyp "0.10.0"
 
-"@carto/tilelive-bridge@github:cartodb/tilelive-bridge#2.5.1-cdb10":
-  version "2.5.1-cdb10"
-  resolved "https://codeload.github.com/cartodb/tilelive-bridge/tar.gz/118ac7e7f6582ac7be0fc0246ea2afd1a7795a43"
+"@carto/tilelive-bridge@github:cartodb/tilelive-bridge#2.5.1-cdb11":
+  version "2.5.1-cdb11"
+  resolved "https://codeload.github.com/cartodb/tilelive-bridge/tar.gz/e35ae36a6e2d555a6b312440f7e1904c5ad03664"
   dependencies:
     "@carto/mapnik" "3.6.2-carto.11"
     "@mapbox/sphericalmercator" "~1.0.1"
@@ -26,9 +26,9 @@
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/@mapbox/sphericalmercator/-/sphericalmercator-1.0.5.tgz#70237b9774095ed1cfdbcea7a8fd1fc82b2691f2"
 
-"abaculus@github:cartodb/abaculus#2.0.3-cdb11":
-  version "2.0.3-cdb11"
-  resolved "https://codeload.github.com/cartodb/abaculus/tar.gz/b2d4dce48c50fefc5b06f21c6365d82ccf75358d"
+"abaculus@github:cartodb/abaculus#2.0.3-cdb12":
+  version "2.0.3-cdb12"
+  resolved "https://codeload.github.com/cartodb/abaculus/tar.gz/6b2400a68100c03267d197104dcc025e70e2f8eb"
   dependencies:
     "@carto/mapnik" "3.6.2-carto.11"
     d3-queue "^2.0.2"
@@ -268,9 +268,9 @@ camelcase@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd"
 
-camshaft@0.62.3:
-  version "0.62.3"
-  resolved "https://registry.yarnpkg.com/camshaft/-/camshaft-0.62.3.tgz#f76c4dff45d00f7750675d0b573ae12975c9138f"
+camshaft@0.62.4:
+  version "0.62.4"
+  resolved "https://registry.yarnpkg.com/camshaft/-/camshaft-0.62.4.tgz#43dc507d817001ea6005dd6fa156d9a7253d29d6"
   dependencies:
     async "^1.5.2"
     bunyan "1.8.1"
@@ -331,9 +331,9 @@ cartodb-query-tables@0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/cartodb-query-tables/-/cartodb-query-tables-0.3.0.tgz#56e18d869666eb2e8e2cb57d0baf3acc923f8756"
 
-cartodb-redis@2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/cartodb-redis/-/cartodb-redis-2.0.1.tgz#6fec0ecbf4aae2603446115559f73e714052c7c7"
+cartodb-redis@2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/cartodb-redis/-/cartodb-redis-2.0.2.tgz#1c07d1df8b79b4312147d1c382da61d1d4f6c63a"
   dependencies:
     dot "~1.0.2"
     redis-mpool "^0.5.0"
@@ -995,9 +995,9 @@ graceful-fs@^4.1.2:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz#4cafad76bc62f02fa039b2f94e9a3dd3a391a725"
 
-grainstore@1.9.1:
-  version "1.9.1"
-  resolved "https://registry.yarnpkg.com/grainstore/-/grainstore-1.9.1.tgz#8efa8f20bad7027fe2eabbb9592f229bd7cf9264"
+grainstore@1.9.2:
+  version "1.9.2"
+  resolved "https://registry.yarnpkg.com/grainstore/-/grainstore-1.9.2.tgz#8eaf979a94cb12b7859da0c7257729fe70dd68b6"
   dependencies:
     carto "0.16.3"
     debug "~3.1.0"
@@ -1574,8 +1574,8 @@ minimist@~0.2.0:
   resolved "http://registry.npmjs.org/minimist/-/minimist-0.2.0.tgz#4dffe525dae2b864c66c2e23c6271d7afdecefce"
 
 minipass@^2.2.1, minipass@^2.3.3:
-  version "2.3.4"
-  resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.3.4.tgz#4768d7605ed6194d6d576169b9e12ef71e9d9957"
+  version "2.3.5"
+  resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.3.5.tgz#cacebe492022497f656b0f0f51e2682a9ed2d848"
   dependencies:
     safe-buffer "^5.1.2"
     yallist "^3.0.0"
@@ -1633,11 +1633,11 @@ mv@~2:
     ncp "~2.0.0"
     rimraf "~2.4.0"
 
-nan@2.10.0, nan@^2.0.8, nan@^2.3.4, nan@~2.10.0:
+nan@2.10.0, nan@^2.3.4, nan@~2.10.0:
   version "2.10.0"
   resolved "https://registry.yarnpkg.com/nan/-/nan-2.10.0.tgz#96d0cd610ebd58d4b4de9cc0c6828cda99c7548f"
 
-nan@^2.4.0:
+nan@^2.0.8, nan@^2.4.0:
   version "2.11.1"
   resolved "https://registry.yarnpkg.com/nan/-/nan-2.11.1.tgz#90e22bccb8ca57ea4cd37cc83d3819b52eea6766"
 
@@ -1647,7 +1647,7 @@ nan@~2.7.0:
 
 ncp@~2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/ncp/-/ncp-2.0.0.tgz#195a21d6c46e361d2fb1281ba38b91e9df7bdbb3"
+  resolved "http://registry.npmjs.org/ncp/-/ncp-2.0.0.tgz#195a21d6c46e361d2fb1281ba38b91e9df7bdbb3"
 
 needle@^2.2.0, needle@^2.2.1:
   version "2.2.4"
@@ -2208,7 +2208,16 @@ redis-commands@^1.2.0:
   version "1.3.5"
   resolved "https://registry.yarnpkg.com/redis-commands/-/redis-commands-1.3.5.tgz#4495889414f1e886261180b1442e7295602d83a2"
 
-redis-mpool@0.5.0, redis-mpool@^0.5.0:
+redis-mpool@0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/redis-mpool/-/redis-mpool-0.6.0.tgz#3703605efd888c1db755ad2e623fe7a577d39584"
+  dependencies:
+    generic-pool "~2.1.1"
+    hiredis "~0.5.0"
+    redis "^2.8.0"
+    underscore "~1.6.0"
+
+redis-mpool@^0.5.0:
   version "0.5.0"
   resolved "https://registry.yarnpkg.com/redis-mpool/-/redis-mpool-0.5.0.tgz#9a22dcffb4ad796ec88ce3038b991deae9d1fda7"
   dependencies:
@@ -2262,7 +2271,7 @@ request@2.81.0:
 
 request@2.85.0:
   version "2.85.0"
-  resolved "https://registry.yarnpkg.com/request/-/request-2.85.0.tgz#5a03615a47c61420b3eb99b7dba204f83603e1fa"
+  resolved "http://registry.npmjs.org/request/-/request-2.85.0.tgz#5a03615a47c61420b3eb99b7dba204f83603e1fa"
   dependencies:
     aws-sign2 "~0.7.0"
     aws4 "^1.6.0"
@@ -2363,7 +2372,7 @@ rimraf@2, rimraf@^2.5.1, rimraf@^2.6.1:
 
 rimraf@~2.4.0:
   version "2.4.5"
-  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.4.5.tgz#ee710ce5d93a8fdb856fb5ea8ff0e2d75934b2da"
+  resolved "http://registry.npmjs.org/rimraf/-/rimraf-2.4.5.tgz#ee710ce5d93a8fdb856fb5ea8ff0e2d75934b2da"
   dependencies:
     glob "^6.0.1"
 
@@ -2709,9 +2718,9 @@ through@2:
   version "2.3.8"
   resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
 
-"tilelive-mapnik@github:cartodb/tilelive-mapnik#0.6.18-cdb15":
-  version "0.6.18-cdb15"
-  resolved "https://codeload.github.com/cartodb/tilelive-mapnik/tar.gz/b6c1404a9e37fc60e545d977081867a86eb42b2b"
+"tilelive-mapnik@github:cartodb/tilelive-mapnik#0.6.18-cdb16":
+  version "0.6.18-cdb16"
+  resolved "https://codeload.github.com/cartodb/tilelive-mapnik/tar.gz/30b5d9f4f6b774d084bc6dc67a7a01d51e129bb5"
   dependencies:
     "@carto/mapnik" "3.6.2-carto.11"
     generic-pool "2.5.4"
@@ -2899,26 +2908,26 @@ window-size@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.2.0.tgz#b4315bb4214a3d7058ebeee892e13fa24d98b075"
 
-windshaft@4.11.4:
-  version "4.11.4"
-  resolved "https://registry.yarnpkg.com/windshaft/-/windshaft-4.11.4.tgz#e8f0de00c1de5f6ed0f34aa4fe386ce02d4a910a"
+windshaft@4.11.5:
+  version "4.11.5"
+  resolved "https://registry.yarnpkg.com/windshaft/-/windshaft-4.11.5.tgz#0ea6cb59dd673bd87276b23499d229d4c2173d56"
   dependencies:
     "@carto/mapnik" "3.6.2-carto.11"
-    "@carto/tilelive-bridge" cartodb/tilelive-bridge#2.5.1-cdb10
-    abaculus cartodb/abaculus#2.0.3-cdb11
+    "@carto/tilelive-bridge" cartodb/tilelive-bridge#2.5.1-cdb11
+    abaculus cartodb/abaculus#2.0.3-cdb12
     canvas cartodb/node-canvas#1.6.2-cdb2
     carto cartodb/carto#0.15.1-cdb3
     cartodb-psql "0.11.0"
     debug "3.1.0"
     dot "1.1.2"
-    grainstore "1.9.1"
+    grainstore "1.9.2"
     queue-async "1.1.0"
-    redis-mpool "0.5.0"
+    redis-mpool "0.6.0"
     request "2.87.0"
     semver "5.5.0"
     sphericalmercator "1.0.5"
     tilelive "5.12.3"
-    tilelive-mapnik cartodb/tilelive-mapnik#0.6.18-cdb15
+    tilelive-mapnik cartodb/tilelive-mapnik#0.6.18-cdb16
     torque.js "2.16.2"
     underscore "1.6.0"