diff --git a/lib/cartodb/models/aggregation/aggregation-query.js b/lib/cartodb/models/aggregation/aggregation-query.js
index 06697732..b98d0dbb 100644
--- a/lib/cartodb/models/aggregation/aggregation-query.js
+++ b/lib/cartodb/models/aggregation/aggregation-query.js
@@ -142,26 +142,26 @@ const aggregationQueryTemplates = {
     `,
 
     'point-grid': ctx => `
-    WITH _cdb_params AS (
+        WITH _cdb_params AS (
+            SELECT
+            ${gridResolution(ctx)} AS res,
+            !bbox! AS bbox
+        ),
+        _cdb_clusters AS (
+            SELECT
+            Floor(ST_X(_cdb_query.the_geom_webmercator)/_cdb_params.res)::int AS _cdb_gx,
+            Floor(ST_Y(_cdb_query.the_geom_webmercator)/_cdb_params.res)::int AS _cdb_gy
+            ${dimensionDefs(ctx)}
+            ${aggregateColumnDefs(ctx)}
+            FROM (${ctx.sourceQuery}) _cdb_query, _cdb_params
+            WHERE the_geom_webmercator && _cdb_params.bbox
+            GROUP BY _cdb_gx, _cdb_gy ${dimensionNames(ctx)}
+        )
         SELECT
-        ${gridResolution(ctx)} AS res,
-        !bbox! AS bbox
-    ),
-    _cdb_clusters AS (
-        SELECT
-        Floor(ST_X(_cdb_query.the_geom_webmercator)/_cdb_params.res)::int AS _cdb_gx,
-        Floor(ST_Y(_cdb_query.the_geom_webmercator)/_cdb_params.res)::int AS _cdb_gy
-        ${dimensionDefs(ctx)}
-        ${aggregateColumnDefs(ctx)}
-        FROM (${ctx.sourceQuery}) _cdb_query, _cdb_params
-        WHERE the_geom_webmercator && _cdb_params.bbox
-        GROUP BY _cdb_gx, _cdb_gy ${dimensionNames(ctx)}
-    )
-    SELECT
-        ST_SetSRID(ST_MakePoint((_cdb_gx+0.5)*res, (_cdb_gy+0.5)*res), 3857) AS the_geom_webmercator
-        ${dimensionNames(ctx)}
-        ${aggregateColumnNames(ctx)}
-        FROM _cdb_clusters, _cdb_params
+            ST_SetSRID(ST_MakePoint((_cdb_gx+0.5)*res, (_cdb_gy+0.5)*res), 3857) AS the_geom_webmercator
+            ${dimensionNames(ctx)}
+            ${aggregateColumnNames(ctx)}
+            FROM _cdb_clusters, _cdb_params
     `,
 
     'point-sample': ctx => `
@@ -212,6 +212,7 @@ const aggregationQueryTemplates = {
         FROM
             _cdb_clusters INNER JOIN (${ctx.sourceQuery}) _cdb_query
             ON (_cdb_clusters.cartodb_id = _cdb_query.cartodb_id)
-`
-
+    `
 };
+
+module.exports.SUPPORTED_PLACEMENTS = Object.keys(aggregationQueryTemplates);