diff --git a/lib/cartodb/server.js b/lib/cartodb/server.js
index d4866ebc..837b8a74 100644
--- a/lib/cartodb/server.js
+++ b/lib/cartodb/server.js
@@ -157,9 +157,9 @@ module.exports = function(serverOptions) {
     var turboCartoParser = new TurboCartoParser(pgQueryRunner);
 
     var mapConfigAdapter = new MapConfigAdapter([
+        new MapConfigNamedLayersAdapter(templateMaps, pgConnection),
         new SqlWrapMapConfigAdapter(),
         new AnalysisMapConfigAdapter(analysisBackend),
-        new MapConfigNamedLayersAdapter(templateMaps, pgConnection),
         new MapConfigOverviewsAdapter(overviewsMetadataApi, filterStatsApi),
         new TurboCartoAdapter(turboCartoParser)
     ]);