Text Search For Query New Design

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

Wrapping this case is a bit odd. You might try binding the result to a temp var you unpack later.