Hello aleksandar base to my observation your mapping is look good so keep it going.
            ---
            
            Published using OSMCha: https://osmcha.org/changesets/152581655
            