Adding geosearch, other features