You shouldn't be using the "lollipop" style of mapping as seen in https://www.openstreetmap.org/way/1367951144. You need to create proper multipolygon relations in order to map features like roughs/bunkers that are within other features. Please see https://wiki.openstreetmap.org/wiki/Relation:multipolygon and https://wiki.openstreetmap.org/wiki/Tag:leisure%3Dgolf_course#Common_mapping_pitfalls for help in understanding how to map this situation. If those aren't clear, please let me know and I'll help explain them further. Thanks.