Text Search For Query New Design

Tests are outdated given the new design and I will re-write them. 

This looks wrong to me. Unless I'm mistaken you're relying on the ordering of json object key/values which will break if someone else writes it with a different order (which isn't impossible).