Bug fixes (tags, db changes)