If we go with this, IMO clean it up with a bot after merge, and as a followup remove the mapping from type to status.
So after that, subs would need status=sub instead of type=sub which then gets mapped
Originally posted by @mbergen in #7230 (comment)