Updated to use SupportedTags filtering