c869b5b884
Remove InheritedTags and update tag filtering logic
Original-merge: 4b38e35bbb
Merged-by: crobibero <cody@robibe.ro>
Backported-by: Bond_009 <bond.009@outlook.com>