Text Search For Query New Design

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

Do we want standard or keyword here?