Text Search For Query New Design

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

I don't think we're ever going to support foo in the future.