diff --git a/src/modules/14_KPI/views/list.vue b/src/modules/14_KPI/views/list.vue
index 335fedf20..ae046a7ef 100644
--- a/src/modules/14_KPI/views/list.vue
+++ b/src/modules/14_KPI/views/list.vue
@@ -19,14 +19,12 @@ const store = useKpiDataStore();
 const { showLoader, hideLoader, messageError, date2Thai, dialogConfirm } =
   useCounterMixin();
 
-const filterKeyword = ref<string>("");
-
 const rows = ref<any[]>([]);
 
 const year = ref<number | null>(new Date().getFullYear());
 
 const modalDialog = ref<boolean>(false);
-const round = ref<string>("");
+
 const roundOp = ref<DataOption[]>([]);
 
 const visibleColumns = ref<string[]>([
@@ -135,7 +133,9 @@ function fetchList() {
     page: store.formQuery.page,
     pageSize: store.formQuery.pageSize,
     kpiPeriodId: store.formQuery.round,
-    keyword: store.formQuery.keyword,
+    keyword: store.formQuery.keyword
+      ? store.formQuery.keyword.replace(/\s+/g, "")
+      : store.formQuery.keyword,
     // status: status.value,
   };
 
@@ -285,16 +285,16 @@ onMounted(async () => {
             <q-input
               outlined
               dense
-              v-model="filterKeyword"
+              v-model="store.formQuery.keyword"
               label="ค้นหาชื่อผู้ขอรับการประเมิน"
               @keydown.enter.prevent="changRound"
             >
               <template v-slot:append>
                 <q-icon
-                  v-if="filterKeyword !== ''"
+                  v-if="store.formQuery.keyword !== ''"
                   name="clear"
                   class="cursor-pointer"
-                  @click="(filterKeyword = ''), changRound()"
+                  @click="(store.formQuery.keyword = ''), changRound()"
                 />
                 <q-icon v-else name="search" color="grey-5" />
               </template>