Fix category tagging