diff --git a/AxonIvyPortal/portal/webContent/layouts/restricted/decorator/TableWidget.xhtml b/AxonIvyPortal/portal/webContent/layouts/restricted/decorator/TableWidget.xhtml
index bd9241a3b21..fa9f256e2fc 100644
--- a/AxonIvyPortal/portal/webContent/layouts/restricted/decorator/TableWidget.xhtml
+++ b/AxonIvyPortal/portal/webContent/layouts/restricted/decorator/TableWidget.xhtml
@@ -95,8 +95,13 @@
       <!-- remote-command to apply widget filter -->
       <p:remoteCommand id="apply-widget-filter-command-#{index}"
         name="applyWidgetFilterCommand#{index}"
-        oncomplete="PF('filter-overlay-panel-#{index}').hide(); #{onCompleteApplyFilters}; resizeTableBody()"
-        update="widget-header-actions"
+        update="#{componentToUpdateOnApplyFilter} #{cc.clientId}:widget-header-actions"
+        oncomplete="PF('filter-overlay-panel-#{index}').hide();"
+        global="false" process="@this" partialSubmit="true" immediate="true"
+        rendered="#{renderFilter}"/>
+        
+       <p:remoteCommand id="apply-widget-filter-command2-#{index}"
+        name="applyInvalidWidgetFilterCommand#{index}"
         global="false" process="@this" partialSubmit="true" immediate="true"
         rendered="#{renderFilter}"/>
 
@@ -239,9 +244,14 @@
   
               <p:commandButton id="apply-button" value="#{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/common/apply')}"
                 partialSubmit="true"
-                update="#{componentToUpdateOnApplyFilter} #{cc.clientId}:widget-header-actions"
+                update="filter-form-#{index}"
                 process="filter-form-#{index}"
-                oncomplete="PF('filter-overlay-panel-#{index}').hide(); initWidgetFilterHtml('#{widget.id}');"
+                oncomplete="if (args &amp;&amp; !args.validationFailed) {
+	                  applyWidgetFilterCommand#{index}();
+	                } else {
+	                  applyInvalidWidgetFilterCommand#{index}();
+	                }
+	                initWidgetFilterHtml('#{widget.id}');"
                 actionListener="#{widget.onApplyUserFilters()}"
                 icon="si si-check-1"
                 styleClass="u-mar-right-5" />
diff --git a/build/create-release/Jenkinsfile b/build/create-release/Jenkinsfile
index bf417c1c5e6..9e2e12c37da 100644
--- a/build/create-release/Jenkinsfile
+++ b/build/create-release/Jenkinsfile
@@ -1,5 +1,5 @@
 pipeline {
-  agent {label 'portal-slave'}
+  agent {label 'lndanh-pc'}
   
   options {
     buildDiscarder(logRotator(numToKeepStr: '60', artifactNumToKeepStr: '5'))
diff --git a/build/document-screenshot-selenide/Jenkinsfile b/build/document-screenshot-selenide/Jenkinsfile
index e7c1cf23954..09e193b1eb0 100644
--- a/build/document-screenshot-selenide/Jenkinsfile
+++ b/build/document-screenshot-selenide/Jenkinsfile
@@ -1,5 +1,5 @@
 pipeline {
-  agent {label 'portal-slave'}
+  agent {label 'lndanh-pc'}
 
   options {
     buildDiscarder(logRotator(numToKeepStr: '60', artifactNumToKeepStr: '60'))
diff --git a/build/gui-test-cluster/Jenkinsfile b/build/gui-test-cluster/Jenkinsfile
index 5ebe87a4b70..f536b61e7ee 100644
--- a/build/gui-test-cluster/Jenkinsfile
+++ b/build/gui-test-cluster/Jenkinsfile
@@ -1,5 +1,5 @@
 pipeline {
-  agent {label 'portal-slave'}
+  agent {label 'lndanh-pc'}
   
   options {
     buildDiscarder(logRotator(numToKeepStr: '60', artifactNumToKeepStr: '30'))
diff --git a/build/gui-test-new-dashboard/Jenkinsfile b/build/gui-test-new-dashboard/Jenkinsfile
index dc28edd480e..faba653d72f 100644
--- a/build/gui-test-new-dashboard/Jenkinsfile
+++ b/build/gui-test-new-dashboard/Jenkinsfile
@@ -1,5 +1,5 @@
 pipeline {
-  agent {label 'portal-slave'}
+  agent {label 'lndanh-pc'}
 
   options {
     buildDiscarder(logRotator(numToKeepStr: '60', artifactNumToKeepStr: '60'))
diff --git a/build/integration/Jenkinsfile b/build/integration/Jenkinsfile
index e65d5b0a743..1ec3f6d3d4e 100644
--- a/build/integration/Jenkinsfile
+++ b/build/integration/Jenkinsfile
@@ -1,5 +1,5 @@
 pipeline {
-  agent {label 'portal-slave'}
+  agent {label 'lndanh-pc'}
   
   options {
     buildDiscarder(logRotator(numToKeepStr: '60', artifactNumToKeepStr: '5'))