More moving values in to keys madness

https://api.openstreetmap.org/user/SimonPoole/diary/46838