amenity=drinking_water with bottle=yes and drinking_water=no is a little bit suspicious.

Also need to Restore : 	image=https://flic.kr/p/JJQksz and mapillary=1857965777699598 deleted in changeset 131474159