Fixed the multiple location search breaks