Text Search For Query New Design

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

Another example of relying on JSON ordering. You need to use functions to grab these values and not rely on the ordering.