CDB-3126 better formatted to differentiate fields