bugId::97764 Added pagination