Use tags, don't hack tags. 

Inspired by @penibest in #167, should have been in 2e5de8f872900626f7ab11aa040bffb6571fb82a