YH-506: fix slow group view