repaired location search broken in some cases