Issue #2194943 by cgove: HTML errors from OA message river abbreviation.