And you should read https://wiki.openstreetmap.org/wiki/One_feature,_one_OSM_element#Situations_where_multiple_elements_may_be_needed concerning `natural=water` areas enclosing `waterway=` , as well as `area:highway=` for `highway=` lines. 