> what do you suggest to do for editing the headings for this categories ?

latitude and longitude is specified by locating element at appropriate position and does not need to be included at all

> what do you suggest to do for editing the headings for this categories ?

depends 

is https://www.openstreetmap.org/node/12281594064/history a shop selling water?

or is it a water storage tank, where water is stored by not a https://wiki.openstreetmap.org/wiki/Tag:shop%3Dwater ?