Keywords and tags refactor, errors fixed