Add post_box
Add social facility
Sort
Add amenity=shelter
Add other documented object types
Add tourism=artwork
Add drinking water
Add waterfall
Add sauna
Try to sort out office=administrative vs. amenity=townhall
Add subway station to differentiate from railway station