diff --git a/src/components/Pages/Gangguan/Rekap/RGangguan_PerRegu.vue b/src/components/Pages/Gangguan/Rekap/RGangguan_PerRegu.vue
index 7c54b79..e2af38e 100755
--- a/src/components/Pages/Gangguan/Rekap/RGangguan_PerRegu.vue
+++ b/src/components/Pages/Gangguan/Rekap/RGangguan_PerRegu.vue
@@ -40,9 +40,8 @@
       <DxColumnFixing :enabled="true" />
 
       <DxColumn
-        :width="60"
+        :width="50"
         alignment="center"
-        data-field="no"
         caption="NO"
         css-class="custom-table-column"
         cell-template="formatNumber"
@@ -559,15 +558,15 @@
         />
       </DxSummary>
 
-      <template #cellCenter="{ data }">
-        <p class="cursor-pointer">
+      <template #formatText="{ data }">
+        <p class="text-left cursor-pointer" @click="setAgreementDialog(false, 0)">
           {{ data.text }}
         </p>
       </template>
 
-      <template #formatText="{ data }">
-        <p class="text-left cursor-pointer" @click="setAgreementDialog(false, 0)">
-          {{ data.text }}
+      <template #formatNumbering="{ data }">
+        <p class="text-right cursor-pointer" @click="setAgreementDialog(false, 0)">
+          {{ data.rowIndex }}
         </p>
       </template>
 
@@ -1311,7 +1310,13 @@ const filterData = async (params: any) => {
   await requestGraphQl(queries.gangguan.rekap.gangguanPerRegu, query)
     .then((result) => {
       if (result.data.data != undefined) {
-        data.value = result.data.data.rekapitulasiGangguanPerRegu
+        if (grouping.value.length > 0 && grouping.value[0].data != '') {
+          data.value = [...result.data.data.rekapitulasiGangguanPerRegu].sort((a, b) =>
+            a[grouping.value[0].data].localeCompare(b[grouping.value[0].data])
+          )
+        } else {
+          data.value = result.data.data.rekapitulasiGangguanPerRegu
+        }
       } else {
         data.value = []
       }
diff --git a/src/components/Pages/Gangguan/Rekap/RGangguan_PerTanggal.vue b/src/components/Pages/Gangguan/Rekap/RGangguan_PerTanggal.vue
index e3325cd..f51c9af 100755
--- a/src/components/Pages/Gangguan/Rekap/RGangguan_PerTanggal.vue
+++ b/src/components/Pages/Gangguan/Rekap/RGangguan_PerTanggal.vue
@@ -1044,7 +1044,13 @@ const filterData = async (params: any) => {
   await requestGraphQl(queries.gangguan.rekap.gangguanPerTanggal, query)
     .then((result) => {
       if (result.data.data != undefined) {
-        data.value = result.data.data.rekapitulasiGangguanPerTanggal
+        if (grouping.value.length > 0 && grouping.value[0].data != '') {
+          data.value = [...result.data.data.rekapitulasiGangguanPerTanggal].sort((a, b) =>
+            a[grouping.value[0].data].localeCompare(b[grouping.value[0].data])
+          )
+        } else {
+          data.value = result.data.data.rekapitulasiGangguanPerTanggal
+        }
       } else {
         data.value = []
       }
diff --git a/src/components/Pages/Keluhan/Rekap/RKeluhan_PerFungsiBidang.vue b/src/components/Pages/Keluhan/Rekap/RKeluhan_PerFungsiBidang.vue
index e39f947..c2e9a1e 100755
--- a/src/components/Pages/Keluhan/Rekap/RKeluhan_PerFungsiBidang.vue
+++ b/src/components/Pages/Keluhan/Rekap/RKeluhan_PerFungsiBidang.vue
@@ -1076,18 +1076,12 @@ const filterData = async (params: any) => {
   await requestGraphQl(queries.keluhan.rekap.keluhanPenyelesaianPerFungsiBIidang, query)
     .then((result) => {
       if (result.data.data != undefined) {
-        if (filters.value.groupBy) {
-          data.value = [...result.data.data.rekapitulasiKeluhanPenyelesaianPerFungsiBidang]
-            .sort((a, b) => a.nama_uid.localeCompare(b.nama_uid))
-            .map((item, index) => {
-              return { ...item, number: index + 1 }
-            })
-        } else {
-          data.value = [...result.data.data.rekapitulasiKeluhanPenyelesaianPerFungsiBidang].map(
-            (item, index) => {
-              return { ...item, number: index + 1 }
-            }
+        if (grouping.value.length > 0 && grouping.value[0].data != '') {
+          data.value = [...result.data.data.rekapitulasiKeluhanPenyelesaianPerFungsiBidang].sort(
+            (a, b) => a[grouping.value[0].data].localeCompare(b[grouping.value[0].data])
           )
+        } else {
+          data.value = result.data.data.rekapitulasiKeluhanPenyelesaianPerFungsiBidang
         }
 
         reportMeta.value = {
diff --git a/src/components/Pages/Keluhan/Rekap/RKeluhan_PerKelompokKeluhan.vue b/src/components/Pages/Keluhan/Rekap/RKeluhan_PerKelompokKeluhan.vue
index def15ec..e7327f2 100755
--- a/src/components/Pages/Keluhan/Rekap/RKeluhan_PerKelompokKeluhan.vue
+++ b/src/components/Pages/Keluhan/Rekap/RKeluhan_PerKelompokKeluhan.vue
@@ -1077,9 +1077,17 @@ const filterData = async (params: any) => {
   )
     .then((result) => {
       if (result.data.data != undefined) {
-        data.value = isGroupBy.value
-          ? result.data.data.rekapitulasiKeluhanPerKelompokKeluhanUid
-          : result.data.data.rekapitulasiKeluhanPerKelompokKeluhan
+        const ref = isGroupBy.value
+          ? [...result.data.data.rekapitulasiKeluhanPerKelompokKeluhanUid]
+          : [...result.data.data.rekapitulasiKeluhanPerKelompokKeluhan]
+
+        if (grouping.value.length > 0 && grouping.value[0].data != '') {
+          data.value = ref.sort((a, b) =>
+            a[grouping.value[0].data].localeCompare(b[grouping.value[0].data])
+          )
+        } else {
+          data.value = ref
+        }
       } else {
         data.value = []
       }
diff --git a/src/components/Pages/Keluhan/Rekap/RKeluhan_PerTanggal.vue b/src/components/Pages/Keluhan/Rekap/RKeluhan_PerTanggal.vue
index 0552066..f21d5c5 100755
--- a/src/components/Pages/Keluhan/Rekap/RKeluhan_PerTanggal.vue
+++ b/src/components/Pages/Keluhan/Rekap/RKeluhan_PerTanggal.vue
@@ -1077,7 +1077,15 @@ const filterData = async (params: any) => {
   await requestGraphQl(queries.keluhan.rekap.keluhanPerTanggal, query)
     .then((result) => {
       if (result.data.data != undefined) {
-        data.value = result.data.data.rekapitulasiKeluhanPerTanggal
+        if (grouping.value.length > 0 && grouping.value[0].data != '') {
+          console.log([...result.data.data.rekapitulasiKeluhanPerTanggal])
+
+          data.value = [...result.data.data.rekapitulasiKeluhanPerTanggal].sort((a, b) =>
+            a[grouping.value[0].data].localeCompare(b[grouping.value[0].data])
+          )
+        } else {
+          data.value = result.data.data.rekapitulasiKeluhanPerTanggal
+        }
       } else {
         data.value = []
       }
diff --git a/src/utils/api/api.graphql.ts b/src/utils/api/api.graphql.ts
index 28e3b4b..c0fa4e8 100755
--- a/src/utils/api/api.graphql.ts
+++ b/src/utils/api/api.graphql.ts
@@ -411,6 +411,10 @@ export const queries = {
           ) {
             id_uid
             nama_uid
+            id_up3
+            nama_up3
+            id_ulp
+            nama_ulp
             tanggal_lapor
             total
             total_durasi_response