Merge "Show search results when query string contains trailing space"