Fix tagging mechanics