master: add tags and cats