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

Also makes test that fails on master pass.

Goes along with direct-seo#969

All tests pass.