Text Search For Query New Design

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

If you're just extracting values from a variable its usually best to put that into the function body. It helps with both function signature lengths as well as avoids confusion on if they're purely being extracted or if there's an intended match happening.