Fix UTM query, move filters to proper place

queries/analytics/pageview/getPageviewParams.js

@@ -19,18 +19,18 @@ export function getPageviewParams(
 
   return rawQuery(
     `select * from (
-        select
+      select
-            url, split_part(split_part(url, concat($1, '='), 2), '&', 1) param
+        url, split_part(split_part(url, concat($1, '='), 2), '&', 1) param
-        from
+      from
-            pageview
+        pageview
-            ${joinSession}
+        ${joinSession}
-            ${pageviewQuery}
+      where
-            ${joinSession && sessionQuery}
+        ${table}.website_id=$2 and ${table}.created_at between $3 and $4
-            ${eventQuery}
+        ${pageviewQuery}
-        where
+        ${joinSession && sessionQuery}
-            ${table}.website_id=$2 and ${table}.created_at between $3 and $4
+        ${eventQuery}
-        group by 1, 2
+      group by 1, 2
-        order by 2 desc
+      order by 2 desc
     ) q
     where q.param <> ''`,
     params,