Text Search For Query New Design

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

Same indent issue. One below here as well.