Text Search For Query New Design

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

@kocolosk had a patch the other day in the other module to speed this up. You'll want to re-use that here.