added code for GeoSearch functionality and improved lot of other things