Adjust query helper for blank search edge cases