diff --git a/lib/cartodb/controllers/map.js b/lib/cartodb/controllers/map.js
index 52d71f93..9f15383f 100644
--- a/lib/cartodb/controllers/map.js
+++ b/lib/cartodb/controllers/map.js
@@ -280,7 +280,7 @@ function createLayergroup (mapBackend, userLimitsApi) {
                 return next(err);
             }
 
-            res.locals.layergroup = layergroup;
+            res.body = layergroup;
 
             next();
         });
@@ -299,7 +299,7 @@ function instantiateLayergroup (mapBackend, userLimitsApi) {
                 return next(err);
             }
 
-            res.locals.layergroup = layergroup;
+            res.body = layergroup;
 
             const { mapconfigProvider } = res.locals;
 
@@ -332,7 +332,7 @@ function incrementMapViewCount (metadataBackend) {
 
 function augmentLayergroupData () {
     return function augmentLayergroupDataMiddleware (req, res, next) {
-        const { layergroup } = res.locals;
+        const layergroup = res.body;
 
         // include in layergroup response the variables in serverMedata
         // those variables are useful to send to the client information
@@ -345,7 +345,8 @@ function augmentLayergroupData () {
 
 function getAffectedTables (pgConnection, layergroupAffectedTables) {
     return function getAffectedTablesMiddleware (req, res, next) {
-        const { dbname, layergroup, user, mapconfig } = res.locals;
+        const { dbname, user, mapconfig } = res.locals;
+        const layergroup = res.body;
 
         pgConnection.getConnection(user, (err, connection) => {
             if (err) {
@@ -403,7 +404,8 @@ function setLastModified () {
 
 function setLastUpdatedTimeToLayergroup () {
     return function setLastUpdatedTimeToLayergroupMiddleware (req, res, next) {
-        const { affectedTables, layergroup, analysesResults } = res.locals;
+        const { affectedTables, analysesResults } = res.locals;
+        const layergroup = res.body;
 
         var lastUpdateTime = affectedTables.getLastUpdatedAt();
 
@@ -443,7 +445,8 @@ function setCacheControl () {
 
 function setLayerStats (pgConnection, statsBackend) {
     return function setLayerStatsMiddleware(req, res, next) {
-        const { user, mapconfig, layergroup } = res.locals;
+        const { user, mapconfig } = res.locals;
+        const layergroup = res.body;
 
         pgConnection.getConnection(user, (err, connection) => {
             if (err) {
@@ -469,7 +472,8 @@ function setLayerStats (pgConnection, statsBackend) {
 
 function setLayergroupIdHeader (templateMaps, useTemplateHash) {
     return function setLayergroupIdHeaderMiddleware (req, res, next) {
-        const { layergroup, user, template } = res.locals;
+        const { user, template } = res.locals;
+        const layergroup = res.body;
 
         if (useTemplateHash) {
             var templateHash = templateMaps.fingerPrint(template).substring(0, 8);
@@ -484,7 +488,8 @@ function setLayergroupIdHeader (templateMaps, useTemplateHash) {
 
 function setDataviewsAndWidgetsUrlsToLayergroupMetadata (layergroupMetadata) {
     return function setDataviewsAndWidgetsUrlsToLayergroupMetadataMiddleware (req, res, next) {
-        const { layergroup, user, mapconfig } = res.locals;
+        const { user, mapconfig } = res.locals;
+        const layergroup = res.body;
 
         layergroupMetadata.addDataviewsAndWidgetsUrls(user, layergroup, mapconfig.obj());
 
@@ -494,7 +499,8 @@ function setDataviewsAndWidgetsUrlsToLayergroupMetadata (layergroupMetadata) {
 
 function setAnalysesMetadataToLayergroup (layergroupMetadata, includeQuery) {
     return function setAnalysesMetadataToLayergroupMiddleware (req, res, next) {
-        const { layergroup, user, analysesResults = [] } = res.locals;
+        const { user, analysesResults = [] } = res.locals;
+        const layergroup = res.body;
 
         layergroupMetadata.addAnalysesMetadata(user, layergroup, analysesResults, includeQuery);
 
@@ -504,7 +510,8 @@ function setAnalysesMetadataToLayergroup (layergroupMetadata, includeQuery) {
 
 function setTurboCartoMetadataToLayergroup (layergroupMetadata) {
     return function setTurboCartoMetadataToLayergroupMiddleware (req, res, next) {
-        const { layergroup, mapconfig, context } = res.locals;
+        const { mapconfig, context } = res.locals;
+        const layergroup = res.body;
 
         layergroupMetadata.addTurboCartoContextMetadata(layergroup, mapconfig.obj(), context);
 
@@ -514,7 +521,8 @@ function setTurboCartoMetadataToLayergroup (layergroupMetadata) {
 
 function setAggregationMetadataToLayergroup (layergroupMetadata) {
     return function setAggregationMetadataToLayergroupMiddleware (req, res, next) {
-        const { layergroup, mapconfig, context } = res.locals;
+        const { mapconfig, context } = res.locals;
+        const layergroup = res.body;
 
         layergroupMetadata.addAggregationContextMetadata(layergroup, mapconfig.obj(), context);
 
@@ -524,7 +532,8 @@ function setAggregationMetadataToLayergroup (layergroupMetadata) {
 
 function setTilejsonMetadataToLayergroup (layergroupMetadata) {
     return function augmentLayergroupTilejsonMiddleware (req, res, next) {
-        const { layergroup, user, mapconfig } = res.locals;
+        const { user, mapconfig } = res.locals;
+        const layergroup = res.body;
 
         layergroupMetadata.addTileJsonMetadata(layergroup, user, mapconfig);
 
@@ -551,14 +560,13 @@ function setSurrogateKeyHeader (surrogateKeysCache) {
 function sendResponse () {
     return function sendResponseMiddleware (req, res) {
         req.profiler.done('res');
-        const { layergroup } = res.locals;
 
-        res.status(200);
+        res.status(res.statusCode || 200);
 
         if (req.query && req.query.callback) {
-            res.jsonp(layergroup);
+            res.jsonp(res.body);
         } else {
-            res.json(layergroup);
+            res.json(res.body);
         }
     };
 }