WIP: Remove faulty cases iwhen matching tags