[UAT-166] FIXME: Ugly backend fix for grid view issue