Simplify tags to try to get filtering working