master: reorg tags and cats