Improved tags filter