Merge "RCFilters: Followup Iebc3176c5d: Bidi isolate filter tags"