fix optional formatting for HCC numbers