Updated to use SupportedTags for stream filtering