Pull out location search into own method