Text Search For Query New Design

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

Same as above on avoiding multi-line in-line clauses.