Changes to displaying data(OMS-377)