Fixing Analytics query to use Query Params