Added better map support to filter with geo-points (lat,lon)

Please review the changes and merge them to the origin