search query is now s, like previously search queries. Also sends trackPageview if no search query
Merge branch 'master' into production