Improving OSMCHA

https://www.openstreetmap.org/user/wille/diary/40511