INTEG-260: Update to avoid mixing data which display with data which store