PIM-2216 : update option formatter to be ORM/ODM compliant