Fix tagging bugs for opat admissions