diff --git a/src/modules/06_retirement/views/01_retirement.vue b/src/modules/06_retirement/views/01_retirement.vue
index 65f1c2bc2..707688787 100644
--- a/src/modules/06_retirement/views/01_retirement.vue
+++ b/src/modules/06_retirement/views/01_retirement.vue
@@ -267,6 +267,8 @@ onMounted(async () => {
                 option-value="id"
                 option-label="year"
                 lazy-rules
+                hide-selected
+                fill-input
                 use-input
                 hide-bottom-space
                 :readonly="false"
diff --git a/src/modules/07_insignia/views/01_RoundMain.vue b/src/modules/07_insignia/views/01_RoundMain.vue
index 1e6d551db..e783538dd 100644
--- a/src/modules/07_insignia/views/01_RoundMain.vue
+++ b/src/modules/07_insignia/views/01_RoundMain.vue
@@ -215,13 +215,7 @@ onMounted(async () => {
           placeholder="ค้นหา"
         >
           <template v-slot:append>
-            <q-icon v-if="filterKeyword == ''" name="search" />
-            <q-icon
-              v-if="filterKeyword !== ''"
-              name="clear"
-              class="cursor-pointer"
-              @click="resetFilter"
-            />
+            <q-icon name="search" />
           </template>
         </q-input>
 
@@ -244,7 +238,7 @@ onMounted(async () => {
           ref="table"
           :columns="columns"
           :rows="rows"
-          :filter="filterKeyword"
+          :filter="filterKeyword.trim()"
           row-key="Order"
           flat
           bordered
diff --git a/src/modules/18_command/components/DialogCreateCommandORG.vue b/src/modules/18_command/components/DialogCreateCommandORG.vue
index 5ae1c39c8..c2cc53cb5 100644
--- a/src/modules/18_command/components/DialogCreateCommandORG.vue
+++ b/src/modules/18_command/components/DialogCreateCommandORG.vue
@@ -228,7 +228,7 @@ function updateValue() {
 function getPerson() {
   const body = {
     rootId: rootId.value ? rootId.value : "",
-    type: group.value,
+    type: props.systemName == "SALARY_EMP" ? "" : group.value,
   };
 
   const pathAPI =
@@ -474,7 +474,7 @@ watch(modal, async () => {
             </div>
 
             <!-- กลุ่ม -->
-            <div class="col-12">
+            <div class="col-12" v-if="props.systemName !== 'SALARY_EMP'">
               <q-select
                 v-model="group"
                 :label="`${'กลุ่ม'}`"