diff --git a/src/modules/04_registryPerson/views/listView.vue b/src/modules/04_registryPerson/views/listView.vue
index 59cdeda46..de163405f 100644
--- a/src/modules/04_registryPerson/views/listView.vue
+++ b/src/modules/04_registryPerson/views/listView.vue
@@ -465,7 +465,7 @@ onMounted(async () => {
               dense
               label-color="white"
               dropdown-icon="mdi-chevron-down"
-              class="q-px-sm"
+              class="q-pl-sm"
               @click="() => ((selectNode = true), showLoader())"
             >
               <template v-slot:label>
@@ -493,6 +493,19 @@ onMounted(async () => {
               </template>
             </q-btn-dropdown>
 
+            <q-toggle
+              v-if="store.formFilter.nodeId"
+              v-model="store.formFilter.isAll"
+              color="primary"
+              label="แสดงทุกตำแหน่ง"
+              class="q-pr-sm"
+              @update:model-value="getSearch"
+            >
+              <q-tooltip
+                >แสดงทุกตำแหน่งที่อยู่ภายใต้หน่วยงาน/ส่วนราชการที่เลือก</q-tooltip
+              >
+            </q-toggle>
+
             <q-separator inset vertical class="lineFil" />
 
             <q-btn-dropdown
@@ -585,6 +598,9 @@ onMounted(async () => {
             <div class="q-pt-sm q-pr-sm">
               <a href="/report/registry" class="text-white">
                 การค้นหาขั้นสูง
+                <q-tooltip
+                  >ไปยังหน้าการค้นหาขั้นสูง (Advanced search)</q-tooltip
+                >
               </a>
             </div>
 
@@ -611,6 +627,7 @@ onMounted(async () => {
               v-model="store.formFilter.isShowRetire"
               color="primary"
               label="แสดงข้อมูลผู้พ้นจากราชการ"
+              class="q-pr-sm"
               @update:model-value="getSearch"
             />
             <q-btn-dropdown
@@ -626,7 +643,7 @@ onMounted(async () => {
                 {{
                   store.labelOption.retireType !== "ทั้งหมด"
                     ? store.labelOption.retireType
-                    : `ประเภท${store.labelOption.retireType}`
+                    : `${store.labelOption.retireType}`
                 }}
                 <q-btn
                   v-if="store.labelOption.retireType !== 'ทั้งหมด'"
@@ -698,6 +715,7 @@ onMounted(async () => {
               v-model="store.formFilter.isProbation"
               color="primary"
               label="ทดลองปฏิบัติหน้าที่ราชการ"
+              class="q-pr-sm"
               @update:model-value="getSearch"
             />
 
@@ -707,6 +725,7 @@ onMounted(async () => {
               v-model="store.formFilter.isShowRetire"
               color="primary"
               label="แสดงข้อมูลผู้พ้นจากราชการ"
+              class="q-pr-sm"
               @update:model-value="getSearch"
             />
 
@@ -717,13 +736,12 @@ onMounted(async () => {
               dense
               label-color="white"
               dropdown-icon="mdi-chevron-down"
-              class="q-px-sm"
             >
               <template v-slot:label>
                 {{
                   store.labelOption.retireType !== "ทั้งหมด"
                     ? store.labelOption.retireType
-                    : `ประเภท${store.labelOption.retireType}`
+                    : `${store.labelOption.retireType}`
                 }}
                 <q-btn
                   v-if="store.labelOption.retireType !== 'ทั้งหมด'"
@@ -752,13 +770,13 @@ onMounted(async () => {
 
             <q-separator inset vertical class="lineFil" />
 
-            <q-toggle
+            <!-- <q-toggle
               v-if="store.formFilter.nodeId"
               v-model="store.formFilter.isAll"
               color="primary"
               label="แสดงตำแหน่งทั้งหมด"
               @update:model-value="getSearch"
-            />
+            /> -->
 
             <q-btn-dropdown
               rounded