Add the additional tag types listed in https://docs.google.com/document/d/1NrmVnpIxqMDZA7nZCCgpNcUtslPxnP9C3CFIg8o8H-0/edit?tab=t.0#heading=h.6t9nsdzj4hw

The unfortunately_public_use_instead case will also need to be able to take the token of the replacement API.