Text Search For Query New Design

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

Don't put things on the same line as the match pattern if it doesn't fit on a single line. In this case ?MANGO_ERROR should be part of a multi-line clause body.