tagging fixes