diff --git a/handlers/dev/masterkelainan.handlers.go b/handlers/dev/masterkelainan.handlers.go
index 150bafe..49e19ae 100644
--- a/handlers/dev/masterkelainan.handlers.go
+++ b/handlers/dev/masterkelainan.handlers.go
@@ -862,12 +862,13 @@ func (lh *MasterKelainanHandler) HandlerUpdateStatusKelainanAktif(c echo.Context
 	if selectedStatus == "Y" {
 		buttonCmp := masterkelainan.CustomButtonTidak(
 			models.ButtonPrm{
-				ID:       "non" + id,
-				HxGet:    "/dev/kelainan/flagaktif",
-				HxTarget: "this",
-				HxSwap:   "outerHTML",
-				Label:    "Tidak",
-				Class:    "col-12 col-sm-12 col-md-12 col-lg-5 col-xl-5 col-xxl-5 btn btn-light-danger mb-2",
+				ID:        "non" + id,
+				HxGet:     "/dev/kelainan/flagaktif?id=" + id + "&selectedStatus=N",
+				HxTarget:  "#non" + id,
+				HxSwap:    "outerHTML",
+				HxInclude: "#paginationID, #dialogDeleteBodyID, #dialogDeleteID, #tableID, #non" + id,
+				Label:     "Tidak",
+				Class:     "col-12 col-sm-12 col-md-12 col-lg-5 col-xl-5 col-xxl-5 btn btn-light-danger mb-2",
 			},
 		)
 
@@ -877,12 +878,13 @@ func (lh *MasterKelainanHandler) HandlerUpdateStatusKelainanAktif(c echo.Context
 	} else {
 		buttonCmp := masterkelainan.CustomButtonTidak(
 			models.ButtonPrm{
-				ID:       "active" + id,
-				HxGet:    "/dev/kelainan/flagaktif",
-				HxTarget: "this",
-				HxSwap:   "outerHTML",
-				Label:    "Aktif",
-				Class:    "col-12 col-sm-12 col-md-12 col-lg-5 col-xl-5 col-xxl-5 btn btn-light-tosca mb-2",
+				ID:        "active" + id,
+				HxGet:     "/dev/kelainan/flagaktif?id=" + id + "&selectedStatus=Y",
+				HxTarget:  "#active" + id,
+				HxSwap:    "outerHTML",
+				HxInclude: "#paginationID, #dialogDeleteBodyID, #dialogDeleteID, #tableID, #active" + id,
+				Label:     "Aktif",
+				Class:     "col-12 col-sm-12 col-md-12 col-lg-5 col-xl-5 col-xxl-5 btn btn-light-tosca mb-2",
 			},
 		)
 
@@ -917,12 +919,13 @@ func (lh *MasterKelainanHandler) HandlerUpdateStatusKelainanNonAktif(c echo.Cont
 	if selectedStatus == "N" {
 		buttonCmp := masterkelainan.CustomButtonTidak(
 			models.ButtonPrm{
-				ID:       "active" + id,
-				HxGet:    "/dev/kelainan/flagnonaktif",
-				HxTarget: "this",
-				HxSwap:   "outerHTML",
-				Label:    "Aktif",
-				Class:    "col-12 col-sm-12 col-md-12 col-lg-5 col-xl-5 col-xxl-5 btn btn-light-tosca mb-2",
+				ID:        "active" + id,
+				HxGet:     "/dev/kelainan/flagnonaktif?id=" + id + "&selectedStatus=Y",
+				HxTarget:  "#active" + id,
+				HxSwap:    "outerHTML",
+				HxInclude: "#paginationID, #dialogDeleteBodyID, #dialogDeleteID, #tableID, #active" + id,
+				Label:     "Aktif",
+				Class:     "col-12 col-sm-12 col-md-12 col-lg-5 col-xl-5 col-xxl-5 btn btn-light-tosca mb-2",
 			},
 		)
 
@@ -932,12 +935,13 @@ func (lh *MasterKelainanHandler) HandlerUpdateStatusKelainanNonAktif(c echo.Cont
 	} else {
 		buttonCmp := masterkelainan.CustomButtonTidak(
 			models.ButtonPrm{
-				ID:       "non" + id,
-				HxGet:    "/dev/kelainan/flagnonaktif",
-				HxTarget: "this",
-				HxSwap:   "outerHTML",
-				Label:    "Tidak",
-				Class:    "col-12 col-sm-12 col-md-12 col-lg-5 col-xl-5 col-xxl-5 btn btn-light-danger mb-2",
+				ID:        "non" + id,
+				HxGet:     "/dev/kelainan/flagnonaktif?id=" + id + "&selectedStatus=N",
+				HxTarget:  "#non" + id,
+				HxSwap:    "outerHTML",
+				HxInclude: "#paginationID, #dialogDeleteBodyID, #dialogDeleteID, #tableID, #non" + id,
+				Label:     "Tidak",
+				Class:     "col-12 col-sm-12 col-md-12 col-lg-5 col-xl-5 col-xxl-5 btn btn-light-danger mb-2",
 			},
 		)