I'd take the view that "amenity" implies a degree of personal access, so I reckon amenity=storage is probably sufficient rather than risk unnecessary typos with underscores. Richard