Text Search For Query New Design

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

You need to make these multiline clause bodies in both cases and this body should be on a new line. Here I'd also create temp variables rather than line wrap.