Fix for the location handling on search view