More rewriting because of hardcoded markup in ODAA