Several bugs corrected

https://www.openstreetmap.org/user/Mathias71/diary/4558