changed location search a bit