Fixed location search to auto-predict location of event
Merge