Re-designed water points to be more in line with OSM tagging