diff --git a/src/examples/slickgrid/Example31.tsx b/src/examples/slickgrid/Example31.tsx
index d79edde3..a16bd9d7 100644
--- a/src/examples/slickgrid/Example31.tsx
+++ b/src/examples/slickgrid/Example31.tsx
@@ -455,6 +455,7 @@ export default class Example31 extends React.Component<Props, State> {
   // ---
 
   changeCountEnableFlag() {
+    this.displaySpinner(true);
     const isCountEnabled = !this.state.isCountEnabled;
     this.setState((state: State) => ({ ...state, isCountEnabled }));
     this.resetOptions({ enableCount: isCountEnabled });
@@ -476,12 +477,14 @@ export default class Example31 extends React.Component<Props, State> {
   }
 
   setOdataVersion(version: number) {
+    this.displaySpinner(true);
     this.setState((state: State) => ({ ...state, odataVersion: version }));
     this.resetOptions({ version });
     return true;
   }
 
   private resetOptions(options: Partial<OdataOption>) {
+    this.displaySpinner(true);
     const odataService = this.state.gridOptions?.backendServiceApi?.service as GridOdataService;
     odataService.updateOptions(options);
     odataService.clearFilters();
diff --git a/src/examples/slickgrid/Example5.tsx b/src/examples/slickgrid/Example5.tsx
index e38fc389..550d9269 100644
--- a/src/examples/slickgrid/Example5.tsx
+++ b/src/examples/slickgrid/Example5.tsx
@@ -533,6 +533,7 @@ export default class Example5 extends React.Component<Props, State> {
   }
 
   private resetOptions(options: Partial<OdataOption>) {
+    this.displaySpinner(true);
     const odataService = this.state.gridOptions!.backendServiceApi!.service as GridOdataService;
     odataService.updateOptions(options);
     odataService.clearFilters();
diff --git a/src/examples/slickgrid/Example6.tsx b/src/examples/slickgrid/Example6.tsx
index 5516b5ad..bb3d58ab 100644
--- a/src/examples/slickgrid/Example6.tsx
+++ b/src/examples/slickgrid/Example6.tsx
@@ -427,6 +427,7 @@ class Example6 extends React.Component<Props, State> {
   }
 
   private resetOptions(options: Partial<GraphqlServiceOption>) {
+    this.displaySpinner(true);
     const graphqlService = this.state.gridOptions!.backendServiceApi!.service as GraphqlService;
     this.reactGrid.paginationService!.setCursorBased(options.useCursor as boolean);
     this.reactGrid.paginationService?.goToFirstPage();
diff --git a/test/cypress/e2e/example05.cy.ts b/test/cypress/e2e/example05.cy.ts
index 0f396640..8744dd21 100644
--- a/test/cypress/e2e/example05.cy.ts
+++ b/test/cypress/e2e/example05.cy.ts
@@ -303,6 +303,24 @@ describe('Example 5 - OData Grid', () => {
         .should('have.length', 1);
     });
 
+    it('should return 3 rows using "C*n" (starts with "C" + ends with "n")', () => {
+      cy.get('input.filter-name')
+        .clear()
+        .type('C*n');
+
+      // wait for the query to finish
+      cy.get('[data-test=status]').should('contain', 'finished');
+
+      cy.get('[data-test=odata-query-result]')
+        .should(($span) => {
+          expect($span.text()).to.eq(`$count=true&$top=10&$filter=(startswith(Name, 'C') and endswith(Name, 'n'))`);
+        });
+
+      cy.get(`[style="top: ${GRID_ROW_HEIGHT * 0}px;"] > .slick-cell:nth(1)`).should('contain', 'Carroll Buchanan');
+      cy.get(`[style="top: ${GRID_ROW_HEIGHT * 1}px;"] > .slick-cell:nth(1)`).should('contain', 'Consuelo Dickson');
+      cy.get(`[style="top: ${GRID_ROW_HEIGHT * 2}px;"] > .slick-cell:nth(1)`).should('contain', 'Christine Compton');
+    });
+
     it('should perform filterQueryOverride when operator "%%" is selected', () => {
       cy.get('.search-filter.filter-name select').find('option').last().then((element) => {
         cy.get('.search-filter.filter-name select').select(element.val());
@@ -402,6 +420,7 @@ describe('Example 5 - OData Grid', () => {
       cy.get('#items-per-page-label').select('20');
 
       cy.get('[data-test=enable-count]').click();
+      cy.get('[data-test=enable-count]').should('not.be.checked');
 
       // wait for the query to finish
       cy.get('[data-test=status]').should('contain', 'finished');
@@ -865,32 +884,13 @@ describe('Example 5 - OData Grid', () => {
       cy.get('[data-test=total-items]')
         .contains('50');
     });
-
-    it('should return 2 rows using "C*n" (starts with "C" + ends with "n")', () => {
-      cy.get('input.filter-name')
-        .clear()
-        .type('C*n');
-
-      // wait for the query to finish
-      cy.get('[data-test=status]').should('contain', 'finished');
-
-      cy.get('[data-test=odata-query-result]')
-        .should(($span) => {
-          expect($span.text()).to.eq(`$top=10&$orderby=Name desc&$filter=(Gender eq 'female' and startswith(Name, 'C') and endswith(Name, 'n'))`);
-        });
-
-      cy.get(`[style="top: ${GRID_ROW_HEIGHT * 0}px;"] > .slick-cell:nth(1)`).should('contain', 'Consuelo Dickson');
-      cy.get(`[style="top: ${GRID_ROW_HEIGHT * 1}px;"] > .slick-cell:nth(1)`).should('contain', 'Christine Compton');
-
-      // clear filter before next test
-      cy.get('input.filter-name')
-        .clear();
-    });
   });
 
   describe('Select and Expand Behaviors', () => {
     it('should enable "enableSelect" and "enableExpand" and expect the query to select/expand all fields', () => {
       cy.get('[data-test=enable-expand]').click();
+      cy.get('[data-test=enable-expand]').should('be.checked');
+      cy.wait(5);
 
       // wait for the query to finish
       cy.get('[data-test=status]').should('contain', 'finished');
@@ -901,6 +901,7 @@ describe('Example 5 - OData Grid', () => {
         });
 
       cy.get('[data-test=enable-select]').click();
+      cy.get('[data-test=enable-select]').should('be.checked');
 
       // wait for the query to finish
       cy.get('[data-test=status]').should('contain', 'finished');