diff --git a/MP.Stats/Components/DataPager.razor b/MP.Stats/Components/DataPager.razor
index 39f03d41..eab20eca 100644
--- a/MP.Stats/Components/DataPager.razor
+++ b/MP.Stats/Components/DataPager.razor
@@ -2,27 +2,30 @@
     <div class="col-6 col-lg-10 text-left">
         <div class="row">
             <div class="col-9 small">
-                <Pagination>
-                    <PaginationItem>
-                        <PaginationLink Clicked="@HandlePaginationItemClick" Page="1">
-                            <span aria-hidden="true">«</span>
-                        </PaginationLink>
-                    </PaginationItem>
-                    @for (int i = 1; i <= LastPage; ++i)
-                    {
-                        var pageNum = i;
-                        <PaginationItem Active="@(currPage.Equals(pageNum))">
-                            <PaginationLink Clicked="@HandlePaginationItemClick" Page="@pageNum.ToString()">
-                                @pageNum
+                @if (totalCount > 0)
+                {
+                    <Pagination>
+                        <PaginationItem>
+                            <PaginationLink Clicked="@HandlePaginationItemClick" Page="1">
+                                <span aria-hidden="true">«</span>
                             </PaginationLink>
                         </PaginationItem>
-                    }
-                    <PaginationItem>
-                        <PaginationLink Clicked="@HandlePaginationItemClick" Page="@LastPage.ToString()">
-                            <span aria-hidden="true">»</span>
-                        </PaginationLink>
-                    </PaginationItem>
-                </Pagination>
+                        @for (int i = 1; i <= LastPage; ++i)
+                        {
+                            var pageNum = i;
+                            <PaginationItem Active="@(currPage.Equals(pageNum))">
+                                <PaginationLink Clicked="@HandlePaginationItemClick" Page="@pageNum.ToString()">
+                                    @pageNum
+                                </PaginationLink>
+                            </PaginationItem>
+                        }
+                        <PaginationItem>
+                            <PaginationLink Clicked="@HandlePaginationItemClick" Page="@LastPage.ToString()">
+                                <span aria-hidden="true">»</span>
+                            </PaginationLink>
+                        </PaginationItem>
+                    </Pagination>
+                }
             </div>
             <div class="col-3">
                 @totalCount records
@@ -30,16 +33,19 @@
         </div>
     </div>
     <div class="col-6 col-lg-2 text-right">
-        <div class="input-group input-group-sm">
-            row/pag:&nbsp;
-            <select @bind="@PageSize" class="form-control form-control-sm">
-                <option value="5">5</option>
-                <option value="10">10</option>
-                <option value="25">25</option>
-                <option value="50">50</option>
-                <option value="100">100</option>
-            </select>
-        </div>
+        @if (totalCount > 0)
+        {
+            <div class="input-group input-group-sm">
+                row/pag:&nbsp;
+                <select @bind="@PageSize" class="form-control form-control-sm">
+                    <option value="5">5</option>
+                    <option value="10">10</option>
+                    <option value="25">25</option>
+                    <option value="50">50</option>
+                    <option value="100">100</option>
+                </select>
+            </div>
+        }
     </div>
 </div>
 
diff --git a/MP.Stats/Components/LoadingData.razor b/MP.Stats/Components/LoadingData.razor
new file mode 100644
index 00000000..4eb9ffb3
--- /dev/null
+++ b/MP.Stats/Components/LoadingData.razor
@@ -0,0 +1,6 @@
+<div class="row">
+    <div class="col-12 text-center py-3">
+        <h3>loading data</h3>
+        <i class="fas fa-spinner fa-spin fa-5x"></i>
+    </div>
+</div>
\ No newline at end of file
diff --git a/MP.Stats/Pages/Oee.razor b/MP.Stats/Pages/Oee.razor
index 3319ad45..84b296c3 100644
--- a/MP.Stats/Pages/Oee.razor
+++ b/MP.Stats/Pages/Oee.razor
@@ -16,15 +16,14 @@
             <div class="col-12 table-secondary">
                 <SelectionFilter SelFilter="currFilter" filterChanged="DoFilter"></SelectionFilter>
             </div>
-            @if (totalCount == 0 || ListRecords == null || ListRecords.Count() == 0)
-            {
-                <div class="col-12 text-center py-3">
-                    <h3>loading data</h3>
-                    <i class="fas fa-spinner fa-spin fa-5x"></i>
-                </div>
-            }
-            else
-            {
+        </div>
+        @if (totalCount == 0 || ListRecords == null || ListRecords.Count() == 0)
+        {
+            <LoadingData></LoadingData>
+        }
+        else
+        {
+            <div class="row">
                 <div class="col-12">
                     <table class="table table-sm table-striped">
                         <thead>
@@ -60,10 +59,10 @@
                         </tbody>
                     </table>
                 </div>
-            }
-        </div>
-    </div>
-    <div class="card-footer py-1">
-        <DataPager PageSize="@numRecord" currPage="@currPage" numRecordChanged="ForceReload" numPageChanged="ForceReloadPage" totalCount="@totalCount" />
+            </div>
+        }
     </div>
+</div>
+<div class="card-footer py-1">
+    <DataPager PageSize="@numRecord" currPage="@currPage" numRecordChanged="ForceReload" numPageChanged="ForceReloadPage" totalCount="@totalCount" />
 </div>
\ No newline at end of file
diff --git a/MP.Stats/Pages/Oee.razor.cs b/MP.Stats/Pages/Oee.razor.cs
index b63488ec..d5fd3934 100644
--- a/MP.Stats/Pages/Oee.razor.cs
+++ b/MP.Stats/Pages/Oee.razor.cs
@@ -61,8 +61,6 @@ namespace MP.Stats.Pages
 
         private async Task reloadData()
         {
-            SearchRecords = null;
-            ListRecords = null;
             SearchRecords = await StatService.StatTurniOeeGetAllCached(currFilter, MessageService.SearchVal);
             ListRecords = SearchRecords.Skip(numRecord * (currPage - 1)).Take(numRecord).ToList();
         }
@@ -73,6 +71,8 @@ namespace MP.Stats.Pages
 
         protected async Task DoFilter(SelectData newFilter)
         {
+            SearchRecords = null;
+            ListRecords = null;
             currFilter = newFilter;
             await reloadData();
         }