CDB-2891 Same formatting for org vis than for user vis