Fixed tagging issues