Also, don't draw lollipops in order to get around a feature contained in another feature. For example: a bunker in the middle of a fairway. See https://www.openstreetmap.org/way/1373179981 where you did this. The wiki mentioned above shows the proper way to use multipolygons to map something like that.