add water tap
update surface tags; remove wrongly tagged node
update surface tags
update surface tasg
Update way tags