Give search location and query their own fields [MS-969]

Make failing test pass
Merge pull request #587 from DirectEmployers/analytics-solr-fix

Give search location and query their own fields [MS-969]