Remaking of some partes

https://api.openstreetmap.org/user/Ciprian/diary/592