remove amenity=drinking_water without drinking_water=yes, moved them fixme layer