fix NPE in CloseLocations, null yourLocation
lookup by location type
Merge branch 'enhancements'