HCSVLAB-392: mopping up some rendering funnies caused by the field name changes