Keep generic amenity preset choice (fixes #1354)