fixed top locations
added in search, refactored adding locations