Text Search For Query New Design

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

It occurs to me that this bit is actually incorrect. We'll need to change this so that it can call search multiple times. The reason is that we may need to filter out false positive matches.