Would it make sense to map these facilities as separate elements within the hotel area instead? E.g. instead of tagging the hotel with swimming_pool=yes, map a separate leisure=swimming_pool with appropriate operator & access tags? (Likewise with the gym example.)