Improved search when searching on both text and location.