Hey, added some changes to get a clean support for geo_point, please merge