fix some tagging issues