Refactoring search page queries to use $and operator, but still can't
get the full keyword search to work.