diff --git a/.gitignore b/.gitignore
index aae06b5b2..06b1758f3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,6 +12,7 @@
 /db/orientdb/databases/
 /db/snapshot/
 /elasticsearch*/
+/opensearch*/
 /jackrabbit/jackrabbit/
 /log/
 /sessions/
diff --git a/AUTHORS b/AUTHORS
index 3087600f5..88f33f1b9 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -34,7 +34,7 @@ that are otherwise encumbered.
 
 Signed by git commit adding my legal name and git username:
 
-Written in 2010-2020 by David E. Jones - jonesde
+Written in 2010-2022 by David E. Jones - jonesde
 Written in 2021-2021 by D. Michael Jones - acetousk
 Written in 2014-2015 by Solomon Bessire - sbessire
 Written in 2014-2015 by Jacopo Cappellato - jacopoc
@@ -75,7 +75,7 @@ litigation is filed.
 
 Signed by git commit adding my legal name and git username:
 
-Written in 2010-2020 by David E. Jones - jonesde
+Written in 2010-2022 by David E. Jones - jonesde
 Written in 2021-2021 by D. Michael Jones - acetousk
 Written in 2014-2015 by Solomon Bessire - sbessire
 Written in 2014-2015 by Jacopo Cappellato - jacopoc
diff --git a/README.md b/README.md
index a2647d8f9..29b4872a3 100644
--- a/README.md
+++ b/README.md
@@ -2,10 +2,11 @@
 
 [![license](http://img.shields.io/badge/license-CC0%201.0%20Universal-blue.svg)](https://github.com/moqui/moqui-runtime/blob/master/LICENSE.md)
 [![release](http://img.shields.io/github/release/moqui/moqui-runtime.svg)](https://github.com/moqui/moqui-runtime/releases)
-[![commits since release](http://img.shields.io/github/commits-since/moqui/moqui-runtime/v2.1.3.svg)](https://github.com/moqui/moqui-runtime/commits/master)
+[![commits since release](http://img.shields.io/github/commits-since/moqui/moqui-runtime/v3.0.0.svg)](https://github.com/moqui/moqui-runtime/commits/master)
 
-[![LinkedIn Group](https://img.shields.io/badge/linked%20in%20group-moqui-blue.svg)](https://www.linkedin.com/groups/4640689)
+[![Discourse Forum](https://img.shields.io/badge/moqui%20forum-discourse-blue.svg)](https://forum.moqui.org)
 [![Google Group](https://img.shields.io/badge/google%20group-moqui-blue.svg)](https://groups.google.com/d/forum/moqui)
+[![LinkedIn Group](https://img.shields.io/badge/linked%20in%20group-moqui-blue.svg)](https://www.linkedin.com/groups/4640689)
 [![Gitter Chat at https://gitter.im/moqui/moqui-framework](https://badges.gitter.im/moqui/moqui-framework.svg)](https://gitter.im/moqui/moqui-framework?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 [![Stack Overflow](https://img.shields.io/badge/stack%20overflow-moqui-blue.svg)](http://stackoverflow.com/questions/tagged/moqui)
 
diff --git a/ReleaseNotes.md b/ReleaseNotes.md
index 355bab2ed..91a758334 100644
--- a/ReleaseNotes.md
+++ b/ReleaseNotes.md
@@ -1,9 +1,22 @@
 
 # Moqui Runtime Release Notes
 
-## Release 3.0.0 - Not Yet Released
+## Release 3.0.0 - 31 May 2022
 
-Moqui Runtime 2.1.2 is a patch level new feature and bug fix release, in parallel with the release of Moqui Framework.
+Moqui Runtime 3.0.0 is a major new feature and bug fix release with some changes that are not backward compatible,
+in parallel with the release of Moqui Framework.
+
+In this release there is a new render mode (qvt) and apps screen wrapper (/qapps) that is like vuet and /vapps but uses
+the Quasar project, a Vue JS component library based on Google Material Design. The new Vue JS component library in Moqui
+(in WebrootVue.qvt.js) takes a big step toward more client rendering and better use of Vue JS components and events, 
+making it far easier to extend with dynamic behavior (vs the vuet and html render modes). 
+
+There are various small improvements to the System and Tools apps, and some new screens like an interactive Groovy Shell
+screen and a Table Stats screen that shows the number of records in each entity's table.
+
+This is a brief summary of the changes since the last release, for a complete list see the commit log:
+
+https://github.com/moqui/moqui-runtime/compare/v2.1.3...v3.0.0
 
 ### Non Backward Compatible Changes
 
@@ -11,9 +24,17 @@ Moqui Runtime 2.1.2 is a patch level new feature and bug fix release, in paralle
     - moquiSessionToken: for security reasons, it opened a vector in a CSRF attack to acquire the session token at any time
     - api_key: there is no good use case, just use cases that are less secure and poorly thought through
 
-For a complete list of changes see:
+### New Features
 
-https://github.com/moqui/moqui-runtime/compare/v2.1.3...v3.0.0
+- MFA support for login and update password in screens and REST API with factors including authc code by email and SMS,
+  TOTP code (via authenticator app), backup codes; can set a flag on UserGroup to require second factor for all users in
+  the group, and if any user has any additional factor enable then a second factor will be required
+- Saved Find dialog (in form-list) improvements to show options for scheduled screen render, to send regular reports to
+  users by email (simple email with CSV or XSLT attachment)
+- Groovy Shell screen added to the Tools app (with special permission), an interactive Groovy Console for testing in
+  various environments and for fixing certain production issues
+- Update Swagger UI to 4.1.3 with JS/CSS files loaded from cdnjs instead of locally to avoid having files in the repos
+  making it easier to update over time, along with cleaning up an old mess and a few CVE and WS security issues
 
 ## Release 2.1.3 - 07 Dec 2019
 
diff --git a/base-component/tools/MoquiConf.xml b/base-component/tools/MoquiConf.xml
index 12aa715e5..e1dc584b2 100644
--- a/base-component/tools/MoquiConf.xml
+++ b/base-component/tools/MoquiConf.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!-- No copyright or license for configuration file, details here are not considered a creative work. -->
-<moqui-conf xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/moqui-conf-2.1.xsd">
+<moqui-conf xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/moqui-conf-3.xsd">
     <screen-facade>
         <screen location="component://webroot/screen/webroot/apps.xml">
             <subscreens-item name="system" menu-title="System" menu-index="98" location="component://tools/screen/System.xml"/>
diff --git a/base-component/tools/component.xml b/base-component/tools/component.xml
index ce1567196..385570cbc 100644
--- a/base-component/tools/component.xml
+++ b/base-component/tools/component.xml
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<component xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/moqui-conf-2.1.xsd"
+<component xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/moqui-conf-3.xsd"
         name="tools" version="${moqui_version}"/>
diff --git a/base-component/tools/screen/System.xml b/base-component/tools/screen/System.xml
index 0366c58b9..7b5a85fea 100644
--- a/base-component/tools/screen/System.xml
+++ b/base-component/tools/screen/System.xml
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-title="System" menu-image="fa fa-cog" menu-image-type="icon">
     <subscreens default-item="dashboard"/>
     <widgets>
diff --git a/base-component/tools/screen/System/ArtifactHitBins.xml b/base-component/tools/screen/System/ArtifactHitBins.xml
index 43566773b..688822f06 100644
--- a/base-component/tools/screen/System/ArtifactHitBins.xml
+++ b/base-component/tools/screen/System/ArtifactHitBins.xml
@@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication
 along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-title="Artifact Bins" default-menu-index="3">
 
     <transition name="ArtifactHitBinStats.csv">
diff --git a/base-component/tools/screen/System/ArtifactHitSummary.xml b/base-component/tools/screen/System/ArtifactHitSummary.xml
index 913120512..0dcc651dd 100644
--- a/base-component/tools/screen/System/ArtifactHitSummary.xml
+++ b/base-component/tools/screen/System/ArtifactHitSummary.xml
@@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication
 along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-title="Artifact Summary" default-menu-index="2">
 
     <transition name="ArtifactHitSummaryStats.csv">
diff --git a/base-component/tools/screen/System/AuditLog.xml b/base-component/tools/screen/System/AuditLog.xml
index 45a7d9b7b..3e4971aca 100644
--- a/base-component/tools/screen/System/AuditLog.xml
+++ b/base-component/tools/screen/System/AuditLog.xml
@@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication
 along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-title="Audit Log" default-menu-index="4">
 
     <widgets>
diff --git a/base-component/tools/screen/System/Cache.xml b/base-component/tools/screen/System/Cache.xml
index 24215ec28..a042ea836 100644
--- a/base-component/tools/screen/System/Cache.xml
+++ b/base-component/tools/screen/System/Cache.xml
@@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication
 along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-title="Cache" default-menu-index="5">
     <subscreens default-item="CacheList"/>
     <widgets>
diff --git a/base-component/tools/screen/System/Cache/CacheElements.xml b/base-component/tools/screen/System/Cache/CacheElements.xml
index 6f71075c5..7e2124abf 100644
--- a/base-component/tools/screen/System/Cache/CacheElements.xml
+++ b/base-component/tools/screen/System/Cache/CacheElements.xml
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd">
+        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd">
 
     <parameter name="cacheName" required="true"/>
 
diff --git a/base-component/tools/screen/System/Cache/CacheList.xml b/base-component/tools/screen/System/Cache/CacheList.xml
index 2a4236435..ac1e22780 100644
--- a/base-component/tools/screen/System/Cache/CacheList.xml
+++ b/base-component/tools/screen/System/Cache/CacheList.xml
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd">
+        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd">
 
     <transition name="clearCache">
         <actions><script>ec.cache.getCache(cacheName).clear()</script></actions>
diff --git a/base-component/tools/screen/System/DataDocument.xml b/base-component/tools/screen/System/DataDocument.xml
index 3db795e6e..be3b3c384 100644
--- a/base-component/tools/screen/System/DataDocument.xml
+++ b/base-component/tools/screen/System/DataDocument.xml
@@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication
 along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-title="Data Document" default-menu-index="6">
     <subscreens default-item="Search"/>
     <widgets>
diff --git a/base-component/tools/screen/System/DataDocument/Edit.xml b/base-component/tools/screen/System/DataDocument/Edit.xml
index 07c476baf..6c5d9eb08 100644
--- a/base-component/tools/screen/System/DataDocument/Edit.xml
+++ b/base-component/tools/screen/System/DataDocument/Edit.xml
@@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication
 along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-title="Edit" default-menu-index="6">
     <subscreens default-item="FindDataDocument"/>
     <widgets><subscreens-panel id="DataDocEditPanel" type="tab"/></widgets>
diff --git a/base-component/tools/screen/System/DataDocument/Edit/DataDocFields.xml b/base-component/tools/screen/System/DataDocument/Edit/DataDocFields.xml
index 00f2076dc..2670a8eff 100644
--- a/base-component/tools/screen/System/DataDocument/Edit/DataDocFields.xml
+++ b/base-component/tools/screen/System/DataDocument/Edit/DataDocFields.xml
@@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication
 along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-title="Fields" default-menu-index="2">
 
     <parameter name="dataDocumentId" required="true" from="dataDocumentId ?: dataDocumentId_0"/>
diff --git a/base-component/tools/screen/System/DataDocument/Edit/DataDocFields/FieldList.xml b/base-component/tools/screen/System/DataDocument/Edit/DataDocFields/FieldList.xml
index 7f608d2ef..79863dcc7 100644
--- a/base-component/tools/screen/System/DataDocument/Edit/DataDocFields/FieldList.xml
+++ b/base-component/tools/screen/System/DataDocument/Edit/DataDocFields/FieldList.xml
@@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication
 along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-include="false" standalone="true">
 
     <parameter name="dataDocumentId" required="true" from="dataDocumentId ?: dataDocumentId_0"/>
diff --git a/base-component/tools/screen/System/DataDocument/Edit/EditDataDocument.xml b/base-component/tools/screen/System/DataDocument/Edit/EditDataDocument.xml
index b62d79e40..5fc95266f 100644
--- a/base-component/tools/screen/System/DataDocument/Edit/EditDataDocument.xml
+++ b/base-component/tools/screen/System/DataDocument/Edit/EditDataDocument.xml
@@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication
 along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-title="Data Document" default-menu-index="1">
 
     <parameter name="dataDocumentId" required="true"/>
diff --git a/base-component/tools/screen/System/DataDocument/Edit/FindDataDocument.xml b/base-component/tools/screen/System/DataDocument/Edit/FindDataDocument.xml
index 259a72bf4..f5fde4971 100644
--- a/base-component/tools/screen/System/DataDocument/Edit/FindDataDocument.xml
+++ b/base-component/tools/screen/System/DataDocument/Edit/FindDataDocument.xml
@@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication
 along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-include="false">
 
     <transition name="editDataDocument"><default-response url="../EditDataDocument"/></transition>
diff --git a/base-component/tools/screen/System/DataDocument/Edit/ViewDataDocument.xml b/base-component/tools/screen/System/DataDocument/Edit/ViewDataDocument.xml
index ec0c5b120..374bb7618 100644
--- a/base-component/tools/screen/System/DataDocument/Edit/ViewDataDocument.xml
+++ b/base-component/tools/screen/System/DataDocument/Edit/ViewDataDocument.xml
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-title="View" default-menu-index="3">
 
     <parameter name="dataDocumentId" required="true"/>
diff --git a/base-component/tools/screen/System/DataDocument/Export.xml b/base-component/tools/screen/System/DataDocument/Export.xml
index b03c7d063..c75f4ca67 100644
--- a/base-component/tools/screen/System/DataDocument/Export.xml
+++ b/base-component/tools/screen/System/DataDocument/Export.xml
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-title="Export" default-menu-index="3">
 
     <transition name="DocumentExport.json" read-only="true">
diff --git a/base-component/tools/screen/System/DataDocument/Index.xml b/base-component/tools/screen/System/DataDocument/Index.xml
index 5aa56626f..b96219696 100644
--- a/base-component/tools/screen/System/DataDocument/Index.xml
+++ b/base-component/tools/screen/System/DataDocument/Index.xml
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-title="Index" default-menu-index="2">
 
     <transition name="indexFeedDocuments">
diff --git a/base-component/tools/screen/System/DataDocument/Search.xml b/base-component/tools/screen/System/DataDocument/Search.xml
index af1c45eef..f659436f5 100644
--- a/base-component/tools/screen/System/DataDocument/Search.xml
+++ b/base-component/tools/screen/System/DataDocument/Search.xml
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-title="Search" default-menu-index="1">
 
     <transition name="viewDocument"><default-response url="../ViewDocument"/></transition>
diff --git a/base-component/tools/screen/System/DataDocument/ViewDocument.xml b/base-component/tools/screen/System/DataDocument/ViewDocument.xml
index 0ec7971e9..cdd76c0c9 100644
--- a/base-component/tools/screen/System/DataDocument/ViewDocument.xml
+++ b/base-component/tools/screen/System/DataDocument/ViewDocument.xml
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-include="false" standalone="true">
 
     <parameter name="_index" required="true"/>
diff --git a/base-component/tools/screen/System/EntitySync.xml b/base-component/tools/screen/System/EntitySync.xml
index c585a4879..d4b46e906 100644
--- a/base-component/tools/screen/System/EntitySync.xml
+++ b/base-component/tools/screen/System/EntitySync.xml
@@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication
 along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-index="7">
     <subscreens default-item="EntitySyncList"/>
     <widgets>
diff --git a/base-component/tools/screen/System/EntitySync/EntitySyncDetail.xml b/base-component/tools/screen/System/EntitySync/EntitySyncDetail.xml
index f05632006..e07a0ad1c 100644
--- a/base-component/tools/screen/System/EntitySync/EntitySyncDetail.xml
+++ b/base-component/tools/screen/System/EntitySync/EntitySyncDetail.xml
@@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication
 along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-index="1">
 
     <parameter name="entitySyncId" required="true"/>
diff --git a/base-component/tools/screen/System/EntitySync/EntitySyncHistory.xml b/base-component/tools/screen/System/EntitySync/EntitySyncHistory.xml
index a028e3ae5..2f5c2c6bb 100644
--- a/base-component/tools/screen/System/EntitySync/EntitySyncHistory.xml
+++ b/base-component/tools/screen/System/EntitySync/EntitySyncHistory.xml
@@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication
 along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-title="History" default-menu-index="2">
 
     <parameter name="entitySyncId" required="true"/>
diff --git a/base-component/tools/screen/System/EntitySync/EntitySyncList.xml b/base-component/tools/screen/System/EntitySync/EntitySyncList.xml
index 44166c55c..bc1e64c02 100644
--- a/base-component/tools/screen/System/EntitySync/EntitySyncList.xml
+++ b/base-component/tools/screen/System/EntitySync/EntitySyncList.xml
@@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication
 along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-include="false">
 
     <transition name="entitySyncDetail"><default-response url="../EntitySyncDetail"/></transition>
diff --git a/base-component/tools/screen/System/Instance.xml b/base-component/tools/screen/System/Instance.xml
index cb68a30b0..585193dbd 100644
--- a/base-component/tools/screen/System/Instance.xml
+++ b/base-component/tools/screen/System/Instance.xml
@@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication
 along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-title="Instances" default-menu-index="15">
     <subscreens default-item="InstanceList"/>
     <widgets>
diff --git a/base-component/tools/screen/System/Instance/InstanceDetail.xml b/base-component/tools/screen/System/Instance/InstanceDetail.xml
index d29e569f0..dd9ca1232 100644
--- a/base-component/tools/screen/System/Instance/InstanceDetail.xml
+++ b/base-component/tools/screen/System/Instance/InstanceDetail.xml
@@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication
 along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-title="Instance Detail">
 
     <parameter name="appInstanceId" required="true"/>
diff --git a/base-component/tools/screen/System/Instance/InstanceList.xml b/base-component/tools/screen/System/Instance/InstanceList.xml
index 84fb1b19a..13a3f7f17 100644
--- a/base-component/tools/screen/System/Instance/InstanceList.xml
+++ b/base-component/tools/screen/System/Instance/InstanceList.xml
@@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication
 along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-title="Application Instances" default-menu-include="false">
 
     <transition name="instanceDetail"><default-response url="../InstanceDetail"/></transition>
diff --git a/base-component/tools/screen/System/Localization.xml b/base-component/tools/screen/System/Localization.xml
index 06c532475..01fc5e5ef 100644
--- a/base-component/tools/screen/System/Localization.xml
+++ b/base-component/tools/screen/System/Localization.xml
@@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication
 along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-title="Localization" default-menu-index="8">
     <subscreens default-item="Messages"/>
     <widgets>
diff --git a/base-component/tools/screen/System/Localization/EntityFields.xml b/base-component/tools/screen/System/Localization/EntityFields.xml
index 3595d3aaa..89b50d793 100644
--- a/base-component/tools/screen/System/Localization/EntityFields.xml
+++ b/base-component/tools/screen/System/Localization/EntityFields.xml
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-title="Entity Fields" default-menu-index="2">
 
     <transition name="createLocalizedEntityField">
diff --git a/base-component/tools/screen/System/Localization/Messages.xml b/base-component/tools/screen/System/Localization/Messages.xml
index 61a5cff1a..fb172d4e3 100644
--- a/base-component/tools/screen/System/Localization/Messages.xml
+++ b/base-component/tools/screen/System/Localization/Messages.xml
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-title="Messages" default-menu-index="1">
 
     <transition name="createLocalizedMessage">
diff --git a/base-component/tools/screen/System/LogViewer.xml b/base-component/tools/screen/System/LogViewer.xml
index 5a285956c..fbd0ba730 100644
--- a/base-component/tools/screen/System/LogViewer.xml
+++ b/base-component/tools/screen/System/LogViewer.xml
@@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication
 along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-title="Log Viewer" default-menu-index="20">
 
     <transition name="userAccountDetail"><default-response url="//apps/system/Security/UserAccount/UserAccountDetail"/></transition>
diff --git a/base-component/tools/screen/System/Print.xml b/base-component/tools/screen/System/Print.xml
index 30a696d07..571ba9412 100644
--- a/base-component/tools/screen/System/Print.xml
+++ b/base-component/tools/screen/System/Print.xml
@@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication
 along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-index="9">
     <subscreens default-item="Printer"/>
     <widgets><subscreens-panel id="PrintPanel" type="popup"/></widgets>
diff --git a/base-component/tools/screen/System/Print/PrintJob.xml b/base-component/tools/screen/System/Print/PrintJob.xml
index 9dfec6ea6..b53a1f119 100644
--- a/base-component/tools/screen/System/Print/PrintJob.xml
+++ b/base-component/tools/screen/System/Print/PrintJob.xml
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-title="Print Jobs" default-menu-index="1">
     <subscreens default-item="PrintJobList"/>
     <widgets>
diff --git a/base-component/tools/screen/System/Print/PrintJob/PrintJobDetail.xml b/base-component/tools/screen/System/Print/PrintJob/PrintJobDetail.xml
index 838e019e3..5b1d480da 100644
--- a/base-component/tools/screen/System/Print/PrintJob/PrintJobDetail.xml
+++ b/base-component/tools/screen/System/Print/PrintJob/PrintJobDetail.xml
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-index="1">
 
     <parameter name="printJobId" required="true"/>
diff --git a/base-component/tools/screen/System/Print/PrintJob/PrintJobList.xml b/base-component/tools/screen/System/Print/PrintJob/PrintJobList.xml
index 46043af1a..ddc22d863 100644
--- a/base-component/tools/screen/System/Print/PrintJob/PrintJobList.xml
+++ b/base-component/tools/screen/System/Print/PrintJob/PrintJobList.xml
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-include="false">
 
     <transition name="printJobDetail"><default-response url="../PrintJobDetail"/></transition>
diff --git a/base-component/tools/screen/System/Print/Printer.xml b/base-component/tools/screen/System/Print/Printer.xml
index 734c49f95..a21d24352 100644
--- a/base-component/tools/screen/System/Print/Printer.xml
+++ b/base-component/tools/screen/System/Print/Printer.xml
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-title="Printers" default-menu-index="2">
     <subscreens default-item="PrinterList"/>
     <widgets>
diff --git a/base-component/tools/screen/System/Print/Printer/PrinterList.xml b/base-component/tools/screen/System/Print/Printer/PrinterList.xml
index b85e00d35..668f6f7ce 100644
--- a/base-component/tools/screen/System/Print/Printer/PrinterList.xml
+++ b/base-component/tools/screen/System/Print/Printer/PrinterList.xml
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-include="false">
 
     <transition name="getServerPrinters"><service-call name="org.moqui.impl.PrintServices.get#ServerPrinters"/>
diff --git a/base-component/tools/screen/System/Resource.xml b/base-component/tools/screen/System/Resource.xml
index 445d1eb50..536fe532e 100644
--- a/base-component/tools/screen/System/Resource.xml
+++ b/base-component/tools/screen/System/Resource.xml
@@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication
 along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-title="Resource Finder" default-menu-index="10">
     <subscreens default-item="ElFinder"/>
     <widgets>
diff --git a/base-component/tools/screen/System/Resource/ElFinder.xml b/base-component/tools/screen/System/Resource/ElFinder.xml
index beda6d050..e522f2db2 100644
--- a/base-component/tools/screen/System/Resource/ElFinder.xml
+++ b/base-component/tools/screen/System/Resource/ElFinder.xml
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-title="elFinder">
 
     <parameter name="resourceRoot"/>
diff --git a/base-component/tools/screen/System/Security.xml b/base-component/tools/screen/System/Security.xml
index bc412cd91..f9d6deec0 100644
--- a/base-component/tools/screen/System/Security.xml
+++ b/base-component/tools/screen/System/Security.xml
@@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication
 along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-index="12">
     <subscreens default-item="UserAccount"/>
     <widgets>
diff --git a/base-component/tools/screen/System/Security/ActiveUsers.xml b/base-component/tools/screen/System/Security/ActiveUsers.xml
index 71dd3efac..893a6bdb5 100644
--- a/base-component/tools/screen/System/Security/ActiveUsers.xml
+++ b/base-component/tools/screen/System/Security/ActiveUsers.xml
@@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication
 along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-title="Active Users" default-menu-index="5">
 
     <transition name="userAccountDetail"><default-response url="//system/Security/UserAccountDetail"/></transition>
diff --git a/base-component/tools/screen/System/Security/ArtifactGroup.xml b/base-component/tools/screen/System/Security/ArtifactGroup.xml
index 57ebea2f7..0cadc4bba 100644
--- a/base-component/tools/screen/System/Security/ArtifactGroup.xml
+++ b/base-component/tools/screen/System/Security/ArtifactGroup.xml
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-title="Artifact Groups" default-menu-index="3">
     <subscreens default-item="ArtifactGroupList"/>
     <widgets>
diff --git a/base-component/tools/screen/System/Security/ArtifactGroup/ArtifactGroupDetail.xml b/base-component/tools/screen/System/Security/ArtifactGroup/ArtifactGroupDetail.xml
index 8f3300c4b..547afa377 100644
--- a/base-component/tools/screen/System/Security/ArtifactGroup/ArtifactGroupDetail.xml
+++ b/base-component/tools/screen/System/Security/ArtifactGroup/ArtifactGroupDetail.xml
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-index="1">
 
     <parameter name="artifactGroupId" required="true"/>
diff --git a/base-component/tools/screen/System/Security/ArtifactGroup/ArtifactGroupList.xml b/base-component/tools/screen/System/Security/ArtifactGroup/ArtifactGroupList.xml
index 3dab226ea..883f8cdb0 100644
--- a/base-component/tools/screen/System/Security/ArtifactGroup/ArtifactGroupList.xml
+++ b/base-component/tools/screen/System/Security/ArtifactGroup/ArtifactGroupList.xml
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-include="false">
 
     <transition name="artifactGroupDetail"><default-response url="../ArtifactGroupDetail"/></transition>
diff --git a/base-component/tools/screen/System/Security/UserAccount.xml b/base-component/tools/screen/System/Security/UserAccount.xml
index 71848eb8b..b741cff96 100644
--- a/base-component/tools/screen/System/Security/UserAccount.xml
+++ b/base-component/tools/screen/System/Security/UserAccount.xml
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-title="Users" default-menu-index="1">
     <subscreens default-item="UserAccountList"/>
     <widgets>
diff --git a/base-component/tools/screen/System/Security/UserAccount/UserAccountDetail.xml b/base-component/tools/screen/System/Security/UserAccount/UserAccountDetail.xml
index 244e72225..e9b11c63e 100644
--- a/base-component/tools/screen/System/Security/UserAccount/UserAccountDetail.xml
+++ b/base-component/tools/screen/System/Security/UserAccount/UserAccountDetail.xml
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-index="1">
 
     <parameter name="userId" required="true" from="userId ?: userId_0"/>
diff --git a/base-component/tools/screen/System/Security/UserAccount/UserAccountDetail/VerifyEmail.xml b/base-component/tools/screen/System/Security/UserAccount/UserAccountDetail/VerifyEmail.xml
index 2b1cad05f..8693e7b62 100644
--- a/base-component/tools/screen/System/Security/UserAccount/UserAccountDetail/VerifyEmail.xml
+++ b/base-component/tools/screen/System/Security/UserAccount/UserAccountDetail/VerifyEmail.xml
@@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication
 along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-include="false" standalone="true">
 
     <parameter name="userId" required="true"/>
diff --git a/base-component/tools/screen/System/Security/UserAccount/UserAccountDetail/VerifySms.xml b/base-component/tools/screen/System/Security/UserAccount/UserAccountDetail/VerifySms.xml
index b41fb53ab..b1e8a4aea 100644
--- a/base-component/tools/screen/System/Security/UserAccount/UserAccountDetail/VerifySms.xml
+++ b/base-component/tools/screen/System/Security/UserAccount/UserAccountDetail/VerifySms.xml
@@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication
 along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-include="false" standalone="true">
 
     <parameter name="userId" required="true"/>
diff --git a/base-component/tools/screen/System/Security/UserAccount/UserAccountDetail/VerifyTotp.xml b/base-component/tools/screen/System/Security/UserAccount/UserAccountDetail/VerifyTotp.xml
index 055010d36..9c225458b 100644
--- a/base-component/tools/screen/System/Security/UserAccount/UserAccountDetail/VerifyTotp.xml
+++ b/base-component/tools/screen/System/Security/UserAccount/UserAccountDetail/VerifyTotp.xml
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-include="false" standalone="true">
 
     <parameter name="factorId"/>
diff --git a/base-component/tools/screen/System/Security/UserAccount/UserAccountList.xml b/base-component/tools/screen/System/Security/UserAccount/UserAccountList.xml
index a1295ff79..d8f2c8698 100644
--- a/base-component/tools/screen/System/Security/UserAccount/UserAccountList.xml
+++ b/base-component/tools/screen/System/Security/UserAccount/UserAccountList.xml
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-include="false">
 
     <transition name="userAccountDetail"><default-response url="../UserAccountDetail"/></transition>
diff --git a/base-component/tools/screen/System/Security/UserGroup.xml b/base-component/tools/screen/System/Security/UserGroup.xml
index 52512f793..1d7633e50 100644
--- a/base-component/tools/screen/System/Security/UserGroup.xml
+++ b/base-component/tools/screen/System/Security/UserGroup.xml
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-title="User Groups" default-menu-index="2">
     <subscreens default-item="UserGroupList"/>
     <widgets>
diff --git a/base-component/tools/screen/System/Security/UserGroup/GroupUsers.xml b/base-component/tools/screen/System/Security/UserGroup/GroupUsers.xml
index 5a73e9c11..816e7b8f5 100644
--- a/base-component/tools/screen/System/Security/UserGroup/GroupUsers.xml
+++ b/base-component/tools/screen/System/Security/UserGroup/GroupUsers.xml
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-index="2">
 
     <parameter name="userGroupId" required="true"/>
diff --git a/base-component/tools/screen/System/Security/UserGroup/UserGroupDetail.xml b/base-component/tools/screen/System/Security/UserGroup/UserGroupDetail.xml
index bf39c1a09..edd6a141b 100644
--- a/base-component/tools/screen/System/Security/UserGroup/UserGroupDetail.xml
+++ b/base-component/tools/screen/System/Security/UserGroup/UserGroupDetail.xml
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-index="1">
 
     <parameter name="userGroupId" required="true"/>
diff --git a/base-component/tools/screen/System/Security/UserGroup/UserGroupList.xml b/base-component/tools/screen/System/Security/UserGroup/UserGroupList.xml
index c93f587a4..be0ce6505 100644
--- a/base-component/tools/screen/System/Security/UserGroup/UserGroupList.xml
+++ b/base-component/tools/screen/System/Security/UserGroup/UserGroupList.xml
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-include="false">
 
     <transition name="userGroupDetail"><default-response url="../UserGroupDetail"/></transition>
diff --git a/base-component/tools/screen/System/ServiceJob.xml b/base-component/tools/screen/System/ServiceJob.xml
index 068245b98..5110e9c7f 100644
--- a/base-component/tools/screen/System/ServiceJob.xml
+++ b/base-component/tools/screen/System/ServiceJob.xml
@@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication
 along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-title="Service Jobs" default-menu-index="12">
     <subscreens default-item="Jobs"/>
     <widgets>
diff --git a/base-component/tools/screen/System/ServiceJob/JobRuns.xml b/base-component/tools/screen/System/ServiceJob/JobRuns.xml
index 84ef67090..a36feb0c6 100644
--- a/base-component/tools/screen/System/ServiceJob/JobRuns.xml
+++ b/base-component/tools/screen/System/ServiceJob/JobRuns.xml
@@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication
 along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-title="Job Runs" default-menu-index="2">
 
     <subscreens default-item="JobRunList"/>
diff --git a/base-component/tools/screen/System/ServiceJob/JobRuns/JobRunDetail.xml b/base-component/tools/screen/System/ServiceJob/JobRuns/JobRunDetail.xml
index 2c103c2c5..ea725ce20 100644
--- a/base-component/tools/screen/System/ServiceJob/JobRuns/JobRunDetail.xml
+++ b/base-component/tools/screen/System/ServiceJob/JobRuns/JobRunDetail.xml
@@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication
 along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-title="Job Run Detail" default-menu-index="1">
 
     <parameter name="jobRunId" required="true"/>
diff --git a/base-component/tools/screen/System/ServiceJob/JobRuns/JobRunList.xml b/base-component/tools/screen/System/ServiceJob/JobRuns/JobRunList.xml
index cd4115e0b..b56af9a18 100644
--- a/base-component/tools/screen/System/ServiceJob/JobRuns/JobRunList.xml
+++ b/base-component/tools/screen/System/ServiceJob/JobRuns/JobRunList.xml
@@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication
 along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-include="false">
 
     <transition name="jobRunDetail"><default-response url="../JobRunDetail"/></transition>
diff --git a/base-component/tools/screen/System/ServiceJob/Jobs.xml b/base-component/tools/screen/System/ServiceJob/Jobs.xml
index 78d1777b3..cc4ebd3f9 100644
--- a/base-component/tools/screen/System/ServiceJob/Jobs.xml
+++ b/base-component/tools/screen/System/ServiceJob/Jobs.xml
@@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication
 along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-title="Jobs" default-menu-index="1">
 
     <subscreens default-item="ServiceJobList"/>
diff --git a/base-component/tools/screen/System/ServiceJob/Jobs/ServiceJobDetail.xml b/base-component/tools/screen/System/ServiceJob/Jobs/ServiceJobDetail.xml
index 53a02ba7f..fd530c3a9 100644
--- a/base-component/tools/screen/System/ServiceJob/Jobs/ServiceJobDetail.xml
+++ b/base-component/tools/screen/System/ServiceJob/Jobs/ServiceJobDetail.xml
@@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication
 along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-title="Job Detail" default-menu-index="1">
 
     <parameter name="jobName" required="true"/>
@@ -82,6 +82,8 @@ along with this software (see the LICENSE.md file). If not, see
                         <text-line size="4"/></default-field></field>
                     <field name="minRetryTime"><default-field title="Min Retry Minutes" tooltip="Min time to retry after error, defaults to 5 minutes">
                         <text-line size="4"/></default-field></field>
+                    <field name="priority"><default-field tooltip="Lower numbers run first (ascending sort)">
+                        <text-line size="4"/></default-field></field>
                     <field name="submitButton"><default-field title="Update Job"><submit/></default-field></field>
                     <field-layout>
                         <field-ref name="jobName"/><field-ref name="description"/><field-ref name="serviceName"/>
diff --git a/base-component/tools/screen/System/ServiceJob/Jobs/ServiceJobList.xml b/base-component/tools/screen/System/ServiceJob/Jobs/ServiceJobList.xml
index 2188d8f63..bbcc2f9ba 100644
--- a/base-component/tools/screen/System/ServiceJob/Jobs/ServiceJobList.xml
+++ b/base-component/tools/screen/System/ServiceJob/Jobs/ServiceJobList.xml
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-include="false">
 
     <transition name="serviceJobDetail"><default-response url="../ServiceJobDetail"/></transition>
@@ -73,6 +73,10 @@ along with this software (see the LICENSE.md file). If not, see
                 <header-field><drop-down allow-empty="true"><option key="Y"/><option key="N"/></drop-down></header-field>
                 <default-field><display/></default-field>
             </field>
+            <field name="priority">
+                <header-field show-order-by="true"><!--<range-find size="2"/>--></header-field>
+                <default-field><display/></default-field>
+            </field>
             <field name="findButton"><header-field title="Find"><submit/></header-field><default-field>
                 <display text=" "/></default-field></field>
         </form-list>
diff --git a/base-component/tools/screen/System/SystemMessage.xml b/base-component/tools/screen/System/SystemMessage.xml
index 5b78d7360..48bcecbe6 100644
--- a/base-component/tools/screen/System/SystemMessage.xml
+++ b/base-component/tools/screen/System/SystemMessage.xml
@@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication
 along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-title="Sys-Sys Messages" default-menu-index="13">
     <subscreens default-item="Message"/>
     <widgets>
diff --git a/base-component/tools/screen/System/SystemMessage/Message.xml b/base-component/tools/screen/System/SystemMessage/Message.xml
index 840f847ff..a539efe54 100644
--- a/base-component/tools/screen/System/SystemMessage/Message.xml
+++ b/base-component/tools/screen/System/SystemMessage/Message.xml
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-title="Messages">
     <subscreens default-item="SystemMessageList"/>
     <widgets>
diff --git a/base-component/tools/screen/System/SystemMessage/Message/SystemMessageDetail.xml b/base-component/tools/screen/System/SystemMessage/Message/SystemMessageDetail.xml
index ac3cc3ee2..dd7fc9c25 100644
--- a/base-component/tools/screen/System/SystemMessage/Message/SystemMessageDetail.xml
+++ b/base-component/tools/screen/System/SystemMessage/Message/SystemMessageDetail.xml
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd">
+        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd">
 
     <parameter name="systemMessageId" required="true"/>
 
diff --git a/base-component/tools/screen/System/SystemMessage/Message/SystemMessageDetail/EditMessageText.xml b/base-component/tools/screen/System/SystemMessage/Message/SystemMessageDetail/EditMessageText.xml
index cfedb552a..92f46dafc 100644
--- a/base-component/tools/screen/System/SystemMessage/Message/SystemMessageDetail/EditMessageText.xml
+++ b/base-component/tools/screen/System/SystemMessage/Message/SystemMessageDetail/EditMessageText.xml
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         standalone="true">
 
     <parameter name="systemMessageId" required="true"/>
diff --git a/base-component/tools/screen/System/SystemMessage/Message/SystemMessageList.xml b/base-component/tools/screen/System/SystemMessage/Message/SystemMessageList.xml
index 5d90bf7bf..4800c1567 100644
--- a/base-component/tools/screen/System/SystemMessage/Message/SystemMessageList.xml
+++ b/base-component/tools/screen/System/SystemMessage/Message/SystemMessageList.xml
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-include="false">
 
     <parameter name="isOutgoing"/>
diff --git a/base-component/tools/screen/System/SystemMessage/Remote.xml b/base-component/tools/screen/System/SystemMessage/Remote.xml
index d40b40f6a..fea4d34be 100644
--- a/base-component/tools/screen/System/SystemMessage/Remote.xml
+++ b/base-component/tools/screen/System/SystemMessage/Remote.xml
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-title="Remotes">
     <subscreens default-item="MessageRemoteList"/>
     <widgets>
diff --git a/base-component/tools/screen/System/SystemMessage/Remote/MessageRemoteDetail.xml b/base-component/tools/screen/System/SystemMessage/Remote/MessageRemoteDetail.xml
index 3a082298b..cf070e9a4 100644
--- a/base-component/tools/screen/System/SystemMessage/Remote/MessageRemoteDetail.xml
+++ b/base-component/tools/screen/System/SystemMessage/Remote/MessageRemoteDetail.xml
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd">
+        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd">
 
     <parameter name="systemMessageRemoteId" required="true"/>
 
diff --git a/base-component/tools/screen/System/SystemMessage/Remote/MessageRemoteList.xml b/base-component/tools/screen/System/SystemMessage/Remote/MessageRemoteList.xml
index b715c0f50..eba8397bd 100644
--- a/base-component/tools/screen/System/SystemMessage/Remote/MessageRemoteList.xml
+++ b/base-component/tools/screen/System/SystemMessage/Remote/MessageRemoteList.xml
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-include="false">
 
     <transition name="remoteDetail"><default-response url="../MessageRemoteDetail"/></transition>
diff --git a/base-component/tools/screen/System/SystemMessage/Type.xml b/base-component/tools/screen/System/SystemMessage/Type.xml
index 319a007af..a391e61e1 100644
--- a/base-component/tools/screen/System/SystemMessage/Type.xml
+++ b/base-component/tools/screen/System/SystemMessage/Type.xml
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-title="Types">
     <subscreens default-item="MessageTypeList"/>
     <widgets>
diff --git a/base-component/tools/screen/System/SystemMessage/Type/MessageTypeDetail.xml b/base-component/tools/screen/System/SystemMessage/Type/MessageTypeDetail.xml
index dcc234016..4da03400e 100644
--- a/base-component/tools/screen/System/SystemMessage/Type/MessageTypeDetail.xml
+++ b/base-component/tools/screen/System/SystemMessage/Type/MessageTypeDetail.xml
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd">
+        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd">
 
     <parameter name="systemMessageTypeId" required="true"/>
 
diff --git a/base-component/tools/screen/System/SystemMessage/Type/MessageTypeList.xml b/base-component/tools/screen/System/SystemMessage/Type/MessageTypeList.xml
index c0068e431..2b432289a 100644
--- a/base-component/tools/screen/System/SystemMessage/Type/MessageTypeList.xml
+++ b/base-component/tools/screen/System/SystemMessage/Type/MessageTypeList.xml
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-include="false">
 
     <transition name="typeDetail"><default-response url="../MessageTypeDetail"/></transition>
diff --git a/base-component/tools/screen/System/ThreadList.xml b/base-component/tools/screen/System/ThreadList.xml
index 2a7456bec..f964589b2 100644
--- a/base-component/tools/screen/System/ThreadList.xml
+++ b/base-component/tools/screen/System/ThreadList.xml
@@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication
 along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-index="99" default-menu-title="Thread List">
 
     <transition name="interruptThread">
diff --git a/base-component/tools/screen/System/Visit.xml b/base-component/tools/screen/System/Visit.xml
index 8ef8f5373..aa8e77450 100644
--- a/base-component/tools/screen/System/Visit.xml
+++ b/base-component/tools/screen/System/Visit.xml
@@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication
 along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-title="Visits" default-menu-index="14">
     <subscreens default-item="VisitList"/>
     <widgets>
diff --git a/base-component/tools/screen/System/Visit/VisitDetail.xml b/base-component/tools/screen/System/Visit/VisitDetail.xml
index ec14f9854..5bb4105fa 100644
--- a/base-component/tools/screen/System/Visit/VisitDetail.xml
+++ b/base-component/tools/screen/System/Visit/VisitDetail.xml
@@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication
 along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-include="false">
 
     <parameter name="visitId" required="true"/>
diff --git a/base-component/tools/screen/System/Visit/VisitList.xml b/base-component/tools/screen/System/Visit/VisitList.xml
index 10a2c89ef..3ca3409e8 100644
--- a/base-component/tools/screen/System/Visit/VisitList.xml
+++ b/base-component/tools/screen/System/Visit/VisitList.xml
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd">
+        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd">
 
     <transition name="visitDetail"><default-response url="../VisitDetail"/></transition>
     <transition name="userAccountDetail"><default-response url="//system/Security/UserAccountDetail"/></transition>
diff --git a/base-component/tools/screen/System/dashboard.xml b/base-component/tools/screen/System/dashboard.xml
index 7d00c51ca..69d03ecad 100644
--- a/base-component/tools/screen/System/dashboard.xml
+++ b/base-component/tools/screen/System/dashboard.xml
@@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication
 along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-index="1" menu-image="fa fa-dashboard" menu-image-type="icon">
 
     <transition name="threadList"><default-response url="../ThreadList"/></transition>
@@ -31,6 +31,7 @@ along with this software (see the LICENSE.md file). If not, see
         <set field="runtimeVersionMap" from="ec.factory.versionMap"/>
 
         <set field="workerPool" from="ec.factory.workerPool"/>
+        <set field="jobWorkerPool" from="ec.service.jobWorkerPool"/>
 
         <set field="esClientList" from="ec.elastic.getClientList()"/>
         <set field="esServerInfoList" from="[]"/>
@@ -60,7 +61,7 @@ along with this software (see the LICENSE.md file). If not, see
                 <link url="../Print/PrintJob" text="Print Jobs"/>
                 <link url="../HazelcastInfo" text="Hazelcast"/>
                 <link url="../ServiceJob/Jobs" text="Service Jobs"/>
-                <link url="../ServiceJob/JobRuns" text="Jobs Runs"/>
+                <link url="../ServiceJob/JobRuns" text="Job Runs"/>
             </box-body></container-box>
             <container-box id="Security"><box-header title="Security"/><box-body>
                 <link url="../Security/UserAccount" text="Users"/>
@@ -178,7 +179,15 @@ along with this software (see the LICENSE.md file). If not, see
                             style="${workerPool.getActiveCount() == workerPool.getMaximumPoolSize() ? 'text-warning' : ''}"/></row-col></container-row>
                 <container-row><row-col xs="1"/><row-col xs="4"><label text="Queue" type="strong"/></row-col>
                     <row-col xs="7"><label text="Cur: ${workerPool.queue.size()} Rem: ${workerPool.queue.remainingCapacity()}"
-                            style="workerPool.queue.remainingCapacity() == 0 ? 'text-danger' : (workerPool.queue.size() &gt; workerPool.queue.remainingCapacity() ? 'text-warning' : '')"/></row-col></container-row>
+                            style="${workerPool.queue.remainingCapacity() == 0 ? 'text-danger' : (workerPool.queue.size() &gt; workerPool.queue.remainingCapacity() ? 'text-warning' : '')}"/></row-col></container-row>
+
+                <label text="Service Job Pool" type="strong"/>
+                <container-row><row-col xs="1"/><row-col xs="4"><label text="Threads" type="strong"/></row-col>
+                    <row-col xs="7"><label text="Active: ${jobWorkerPool.getActiveCount()} Cur: ${jobWorkerPool.getPoolSize()} Max: ${jobWorkerPool.getMaximumPoolSize()}"
+                            style="${jobWorkerPool.getActiveCount() == jobWorkerPool.getMaximumPoolSize() ? 'text-warning' : ''}"/></row-col></container-row>
+                <container-row><row-col xs="1"/><row-col xs="4"><label text="Queue" type="strong"/></row-col>
+                    <row-col xs="7"><label text="Cur: ${jobWorkerPool.queue.size()} Rem: ${jobWorkerPool.queue.remainingCapacity()}"
+                            style="${jobWorkerPool.queue.remainingCapacity() == 0 ? 'text-danger' : (jobWorkerPool.queue.size() &gt; jobWorkerPool.queue.remainingCapacity() ? 'text-warning' : '')}"/></row-col></container-row>
             </row-col></container-row>
         </box-body><box-body-nopad>
             <form-list name="DatasourceList" list="smap.DataSources" skip-form="true">
diff --git a/base-component/tools/screen/Tools.xml b/base-component/tools/screen/Tools.xml
index fc685ae72..edad284e4 100644
--- a/base-component/tools/screen/Tools.xml
+++ b/base-component/tools/screen/Tools.xml
@@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication
 along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         include-child-content="true" menu-image="fa fa-wrench" menu-image-type="icon">
     <subscreens default-item="dashboard">
     </subscreens>
diff --git a/base-component/tools/screen/Tools/ArtifactStats.xml b/base-component/tools/screen/Tools/ArtifactStats.xml
index 719b68c55..3045afd89 100644
--- a/base-component/tools/screen/Tools/ArtifactStats.xml
+++ b/base-component/tools/screen/Tools/ArtifactStats.xml
@@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication
 along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-index="3">
 
     <transition name="serviceReference"><default-response url="//tools/ServiceReference"/></transition>
diff --git a/base-component/tools/screen/Tools/AutoScreen.xml b/base-component/tools/screen/Tools/AutoScreen.xml
index f8aef58eb..6619f0ccd 100644
--- a/base-component/tools/screen/Tools/AutoScreen.xml
+++ b/base-component/tools/screen/Tools/AutoScreen.xml
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-title="Auto Screen" default-menu-index="2">
     <subscreens default-item="MainEntityList"/>
     <widgets>
diff --git a/base-component/tools/screen/Tools/AutoScreen/AutoEdit.xml b/base-component/tools/screen/Tools/AutoScreen/AutoEdit.xml
index bfdc2ffd2..9518cb3fe 100644
--- a/base-component/tools/screen/Tools/AutoScreen/AutoEdit.xml
+++ b/base-component/tools/screen/Tools/AutoScreen/AutoEdit.xml
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-title="Edit" default-menu-index="3">
 
     <parameter name="aen" required="true"/>
diff --git a/base-component/tools/screen/Tools/AutoScreen/AutoEdit/AutoEditDetail.xml b/base-component/tools/screen/Tools/AutoScreen/AutoEdit/AutoEditDetail.xml
index b078174dc..3aecebf2a 100644
--- a/base-component/tools/screen/Tools/AutoScreen/AutoEdit/AutoEditDetail.xml
+++ b/base-component/tools/screen/Tools/AutoScreen/AutoEdit/AutoEditDetail.xml
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-title="Edit Detail" default-menu-index="3">
 
     <parameter name="aen" required="true"/><!-- Auto Entity Name -->
@@ -34,7 +34,7 @@ along with this software (see the LICENSE.md file). If not, see
             StringBuilder xmlBuilder = new StringBuilder()
             xmlBuilder.append('<?xml version="1.0" encoding="UTF-8"?>\n')
 
-            MNode screenNode = new MNode("screen", ["xmlns:xsi":"http://www.w3.org/2001/XMLSchema-instance", "xsi:noNamespaceSchemaLocation":"http://moqui.org/xsd/xml-screen-2.1.xsd"])
+            MNode screenNode = new MNode("screen", ["xmlns:xsi":"http://www.w3.org/2001/XMLSchema-instance", "xsi:noNamespaceSchemaLocation":"http://moqui.org/xsd/xml-screen-3.xsd"])
             MNode createTransNode = screenNode.append("transition", [name:"create"])
             createTransNode.append("service-call", [name:"create#${den}".toString()])
             createTransNode.append("default-response", [url:"."])
diff --git a/base-component/tools/screen/Tools/AutoScreen/AutoEdit/AutoEditMaster.xml b/base-component/tools/screen/Tools/AutoScreen/AutoEdit/AutoEditMaster.xml
index 9a8424646..723805cef 100644
--- a/base-component/tools/screen/Tools/AutoScreen/AutoEdit/AutoEditMaster.xml
+++ b/base-component/tools/screen/Tools/AutoScreen/AutoEdit/AutoEditMaster.xml
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-title="Edit Master" default-menu-index="3">
 
     <parameter name="aen" required="true"/><!-- Auto Entity Name -->
@@ -69,7 +69,7 @@ along with this software (see the LICENSE.md file). If not, see
             StringBuilder xmlBuilder = new StringBuilder()
             xmlBuilder.append('<?xml version="1.0" encoding="UTF-8"?>\n')
 
-            MNode screenNode = new MNode("screen", ["xmlns:xsi":"http://www.w3.org/2001/XMLSchema-instance", "xsi:noNamespaceSchemaLocation":"http://moqui.org/xsd/xml-screen-2.1.xsd"])
+            MNode screenNode = new MNode("screen", ["xmlns:xsi":"http://www.w3.org/2001/XMLSchema-instance", "xsi:noNamespaceSchemaLocation":"http://moqui.org/xsd/xml-screen-3.xsd"])
             MNode updateTransNode = screenNode.append("transition", [name:"update"])
             updateTransNode.append("service-call", [name:"update#${aen}".toString()])
             updateTransNode.append("default-response", [url:"."])
diff --git a/base-component/tools/screen/Tools/AutoScreen/AutoFind.xml b/base-component/tools/screen/Tools/AutoScreen/AutoFind.xml
index 678116383..0d19667ae 100644
--- a/base-component/tools/screen/Tools/AutoScreen/AutoFind.xml
+++ b/base-component/tools/screen/Tools/AutoScreen/AutoFind.xml
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-title="Find" default-menu-index="2">
 
     <parameter name="aen" required="true"/>
@@ -32,7 +32,7 @@ along with this software (see the LICENSE.md file). If not, see
 
             StringBuilder xmlBuilder = new StringBuilder()
             xmlBuilder.append('<?xml version="1.0" encoding="UTF-8"?>\n')
-            MNode screenNode = new MNode("screen", ["xmlns:xsi": "http://www.w3.org/2001/XMLSchema-instance", "xsi:noNamespaceSchemaLocation": "http://moqui.org/xsd/xml-screen-2.1.xsd"])
+            MNode screenNode = new MNode("screen", ["xmlns:xsi": "http://www.w3.org/2001/XMLSchema-instance", "xsi:noNamespaceSchemaLocation": "http://moqui.org/xsd/xml-screen-3.xsd"])
             MNode actionsNode = screenNode.append("actions", null)
             actionsNode.append("entity-find", ["entity-name":aen, list:"entityValueList"]).append("search-form-inputs", null)
             MNode widgetsNode = screenNode.append("widgets", null)
diff --git a/base-component/tools/screen/Tools/AutoScreen/MainEntityList.xml b/base-component/tools/screen/Tools/AutoScreen/MainEntityList.xml
index 67648fa58..7fd440318 100644
--- a/base-component/tools/screen/Tools/AutoScreen/MainEntityList.xml
+++ b/base-component/tools/screen/Tools/AutoScreen/MainEntityList.xml
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-title="Auto Screen Entity List" default-menu-index="1">
 
     <transition name="find"><default-response url="../AutoFind"/></transition>
diff --git a/base-component/tools/screen/Tools/DataView.xml b/base-component/tools/screen/Tools/DataView.xml
index 449895979..0d9e25d20 100644
--- a/base-component/tools/screen/Tools/DataView.xml
+++ b/base-component/tools/screen/Tools/DataView.xml
@@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication
 along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-title="Data View" default-menu-index="4">
     <subscreens default-item="FindDbView"/>
     <widgets>
diff --git a/base-component/tools/screen/Tools/DataView/EditDbView.xml b/base-component/tools/screen/Tools/DataView/EditDbView.xml
index eedb58dad..3a717f795 100644
--- a/base-component/tools/screen/Tools/DataView/EditDbView.xml
+++ b/base-component/tools/screen/Tools/DataView/EditDbView.xml
@@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication
 along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-title="Edit Data View Entity" default-menu-index="1">
 
     <parameter name="dbViewEntityName" required="true" from="dbViewEntityName ?: dbViewEntityName_0"/>
diff --git a/base-component/tools/screen/Tools/DataView/FindDbView.xml b/base-component/tools/screen/Tools/DataView/FindDbView.xml
index 159787cb5..34fcb33ae 100644
--- a/base-component/tools/screen/Tools/DataView/FindDbView.xml
+++ b/base-component/tools/screen/Tools/DataView/FindDbView.xml
@@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication
 along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-title="Data View Entity List" default-menu-index="1">
 
     <transition name="edit"><default-response url="../EditDbView"/></transition>
diff --git a/base-component/tools/screen/Tools/DataView/ViewDbView.xml b/base-component/tools/screen/Tools/DataView/ViewDbView.xml
index cca3a6ea9..0f1790338 100644
--- a/base-component/tools/screen/Tools/DataView/ViewDbView.xml
+++ b/base-component/tools/screen/Tools/DataView/ViewDbView.xml
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-title="Data View Results" default-menu-index="1">
 
     <parameter name="dbViewEntityName" required="true"/>
diff --git a/base-component/tools/screen/Tools/Entity.xml b/base-component/tools/screen/Tools/Entity.xml
index 7d6ab22f9..43aeda602 100644
--- a/base-component/tools/screen/Tools/Entity.xml
+++ b/base-component/tools/screen/Tools/Entity.xml
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-title="Entity" default-menu-index="5">
     <subscreens default-item="DataEdit"/>
     <widgets>
diff --git a/base-component/tools/screen/Tools/Entity/DataEdit.xml b/base-component/tools/screen/Tools/Entity/DataEdit.xml
index 8cf50cc8f..b02dc01d2 100644
--- a/base-component/tools/screen/Tools/Entity/DataEdit.xml
+++ b/base-component/tools/screen/Tools/Entity/DataEdit.xml
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-title="Entities">
     <subscreens default-item="EntityList"/>
     <widgets>
diff --git a/base-component/tools/screen/Tools/Entity/DataEdit/EntityDataEdit.xml b/base-component/tools/screen/Tools/Entity/DataEdit/EntityDataEdit.xml
index 8eba0ca8d..4437ce01a 100644
--- a/base-component/tools/screen/Tools/Entity/DataEdit/EntityDataEdit.xml
+++ b/base-component/tools/screen/Tools/Entity/DataEdit/EntityDataEdit.xml
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-title="Edit" default-menu-index="3">
 
     <parameter name="selectedEntity" required="true"/>
diff --git a/base-component/tools/screen/Tools/Entity/DataEdit/EntityDataFind.xml b/base-component/tools/screen/Tools/Entity/DataEdit/EntityDataFind.xml
index 62a379290..d51b98144 100644
--- a/base-component/tools/screen/Tools/Entity/DataEdit/EntityDataFind.xml
+++ b/base-component/tools/screen/Tools/Entity/DataEdit/EntityDataFind.xml
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-title="Find" default-menu-index="2">
 
     <parameter name="selectedEntity" required="true"/>
diff --git a/base-component/tools/screen/Tools/Entity/DataEdit/EntityDetail.xml b/base-component/tools/screen/Tools/Entity/DataEdit/EntityDetail.xml
index 9261da3f8..5eeefa811 100644
--- a/base-component/tools/screen/Tools/Entity/DataEdit/EntityDetail.xml
+++ b/base-component/tools/screen/Tools/Entity/DataEdit/EntityDetail.xml
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-title="Detail">
 
     <parameter name="selectedEntity" required="true"/>
diff --git a/base-component/tools/screen/Tools/Entity/DataEdit/EntityList.xml b/base-component/tools/screen/Tools/Entity/DataEdit/EntityList.xml
index 0927c8e07..8ad0cad8b 100644
--- a/base-component/tools/screen/Tools/Entity/DataEdit/EntityList.xml
+++ b/base-component/tools/screen/Tools/Entity/DataEdit/EntityList.xml
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-title="Entity List" default-menu-index="1">
 
     <transition name="find"><default-response url="../EntityDataFind"/></transition>
diff --git a/base-component/tools/screen/Tools/Entity/DataExport.xml b/base-component/tools/screen/Tools/Entity/DataExport.xml
index e442a20d8..21e8eec83 100644
--- a/base-component/tools/screen/Tools/Entity/DataExport.xml
+++ b/base-component/tools/screen/Tools/Entity/DataExport.xml
@@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication
 along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-title="Export">
 
     <transition name="EntityExport" begin-transaction="false" read-only="true">
diff --git a/base-component/tools/screen/Tools/Entity/DataImport.xml b/base-component/tools/screen/Tools/Entity/DataImport.xml
index 0c8e5a771..89d7792f1 100644
--- a/base-component/tools/screen/Tools/Entity/DataImport.xml
+++ b/base-component/tools/screen/Tools/Entity/DataImport.xml
@@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication
 along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-title="Import">
 
     <transition name="load">
diff --git a/base-component/tools/screen/Tools/Entity/DataSnapshot.xml b/base-component/tools/screen/Tools/Entity/DataSnapshot.xml
index 269fdbdd1..45740716c 100644
--- a/base-component/tools/screen/Tools/Entity/DataSnapshot.xml
+++ b/base-component/tools/screen/Tools/Entity/DataSnapshot.xml
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-title="Snapshots">
 
     <transition name="exportSnapshot" begin-transaction="false">
diff --git a/base-component/tools/screen/Tools/Entity/QueryStats.xml b/base-component/tools/screen/Tools/Entity/QueryStats.xml
index 8317015de..1e2ce99e1 100644
--- a/base-component/tools/screen/Tools/Entity/QueryStats.xml
+++ b/base-component/tools/screen/Tools/Entity/QueryStats.xml
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-title="Query Stats">
 
     <transition name="clearQueryStats"><actions><script>ec.entity.clearQueryStats()</script></actions>
diff --git a/base-component/tools/screen/Tools/Entity/SpeedTest.xml b/base-component/tools/screen/Tools/Entity/SpeedTest.xml
index 561445fe7..6b116cedf 100644
--- a/base-component/tools/screen/Tools/Entity/SpeedTest.xml
+++ b/base-component/tools/screen/Tools/Entity/SpeedTest.xml
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-title="Speed Test" begin-transaction="true">
 
     <transition name="speedTest"><default-response url="."/></transition>
diff --git a/base-component/tools/screen/Tools/Entity/SqlRunner.xml b/base-component/tools/screen/Tools/Entity/SqlRunner.xml
index 454a600ca..5faa6589e 100644
--- a/base-component/tools/screen/Tools/Entity/SqlRunner.xml
+++ b/base-component/tools/screen/Tools/Entity/SqlRunner.xml
@@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication
 along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-title="SQL Runner" begin-transaction="false"><!-- NOTE: begin tx is false so table meta data changes, etc can be done -->
 
     <actions>
diff --git a/base-component/tools/screen/Tools/Entity/TableStats.xml b/base-component/tools/screen/Tools/Entity/TableStats.xml
index 02bb52bb2..df0b2edfa 100644
--- a/base-component/tools/screen/Tools/Entity/TableStats.xml
+++ b/base-component/tools/screen/Tools/Entity/TableStats.xml
@@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication
 along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-title="Table Stats">
 
     <transition name="entityDetail"><default-response url="../DataEdit/EntityDetail"/></transition>
diff --git a/base-component/tools/screen/Tools/GroovyShell.xml b/base-component/tools/screen/Tools/GroovyShell.xml
index 915d9eb73..d2014febe 100644
--- a/base-component/tools/screen/Tools/GroovyShell.xml
+++ b/base-component/tools/screen/Tools/GroovyShell.xml
@@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication
 along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-index="3">
 
     <actions>
diff --git a/base-component/tools/screen/Tools/Service.xml b/base-component/tools/screen/Tools/Service.xml
index 5e8570fc9..ac908f634 100644
--- a/base-component/tools/screen/Tools/Service.xml
+++ b/base-component/tools/screen/Tools/Service.xml
@@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication
 along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-title="Service" default-menu-index="6">
     <subscreens default-item="ServiceReference"/>
     <widgets>
diff --git a/base-component/tools/screen/Tools/Service/ServiceDetail.xml b/base-component/tools/screen/Tools/Service/ServiceDetail.xml
index 0a74a11da..a3303e3db 100644
--- a/base-component/tools/screen/Tools/Service/ServiceDetail.xml
+++ b/base-component/tools/screen/Tools/Service/ServiceDetail.xml
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-include="false">
 
     <parameter name="serviceName" required="true"/>
diff --git a/base-component/tools/screen/Tools/Service/ServiceReference.xml b/base-component/tools/screen/Tools/Service/ServiceReference.xml
index 16482d0b3..f793c9aaf 100644
--- a/base-component/tools/screen/Tools/Service/ServiceReference.xml
+++ b/base-component/tools/screen/Tools/Service/ServiceReference.xml
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-title="Service Reference" default-menu-index="1">
 
     <transition name="serviceDetail">
diff --git a/base-component/tools/screen/Tools/Service/ServiceRun.xml b/base-component/tools/screen/Tools/Service/ServiceRun.xml
index 07c4a37da..aebca28c0 100644
--- a/base-component/tools/screen/Tools/Service/ServiceRun.xml
+++ b/base-component/tools/screen/Tools/Service/ServiceRun.xml
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-title="Service Run" default-menu-index="2">
 
     <parameter name="serviceName"/>
@@ -22,11 +22,7 @@ along with this software (see the LICENSE.md file). If not, see
         <actions>
             <script>
                 org.moqui.context.ExecutionContext ec = context.ec
-                if (cronString) {
-                    ec.service.schedule().name(serviceName).parameters(context).cron(cronString).call()
-                } else {
-                    serviceResults = ec.service.sync().name(serviceName).parameters(context).call()
-                }
+                serviceResults = ec.service.sync().name(serviceName).parameters(context).call()
                 if (serviceResults) {
                     StringBuilder sb = new StringBuilder("Service Run Results:\n")
                     for (def resultEntry in serviceResults) sb.append("==> ${resultEntry.key}: ${resultEntry.value?.toString()}\n")
@@ -65,8 +61,10 @@ along with this software (see the LICENSE.md file). If not, see
                 <auto-fields-service service-name="${serviceName}" include="in" field-type="edit"/>
                 <field name="submitButton"><default-field title="Run Service"><submit/></default-field></field>
 
+                <!-- no longer supported, has not been supported since Quartz Scheduler was removed in 2016
                 <field name="cronString"><default-field tooltip="Enter a cron string to schedule instead of running immediately">
                     <text-line size="20"/></default-field></field>
+                -->
             </form-single>
         </widgets></section>
     </widgets>
diff --git a/base-component/tools/screen/Tools/dashboard.xml b/base-component/tools/screen/Tools/dashboard.xml
index 19bc55a8d..d45b78de6 100644
--- a/base-component/tools/screen/Tools/dashboard.xml
+++ b/base-component/tools/screen/Tools/dashboard.xml
@@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication
 along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-index="1" menu-image="fa fa-dashboard" menu-image-type="icon">
 
     <transition name="reloadEcfi" begin-transaction="false">
diff --git a/base-component/tools/screen/toolstatic.xml b/base-component/tools/screen/toolstatic.xml
index 110ed138b..7aa7d78ef 100644
--- a/base-component/tools/screen/toolstatic.xml
+++ b/base-component/tools/screen/toolstatic.xml
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         require-authentication="anonymous-view">
     <widgets>
         <subscreens-active/>
diff --git a/base-component/tools/service/moqui.rest.xml b/base-component/tools/service/moqui.rest.xml
index a19706226..6d985130a 100644
--- a/base-component/tools/service/moqui.rest.xml
+++ b/base-component/tools/service/moqui.rest.xml
@@ -15,7 +15,7 @@ along with this software (see the LICENSE.md file). If not, see
 
 <!-- General Guideline Verbs: GET=find, POST=create/do, PUT=store (create or update), PATCH=update, DELETE=delete  -->
 
-<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/rest-api-2.1.xsd"
+<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/rest-api-3.xsd"
         name="moqui" displayName="Moqui Tools REST API" version="${moqui_version}"
         description="Services for various system administration and other tools in Moqui Framework. See more information
             about Moqui Framework at [http://www.moqui.org/framework](http://www.moqui.org/framework/index.html)">
@@ -247,5 +247,21 @@ along with this software (see the LICENSE.md file). If not, see
         </id>
     </resource>
 
+    <resource name="wiki">
+        <!-- TODO add more wiki pages and spaces endpoints (see WikiServices.xml) -->
+        <resource name="pages">
+            <id name="wikiSpaceId"><id name="pagePathList" allow-extra-path="true"><method type="get">
+                <service name="org.moqui.impl.WikiServices.get#PublishedWikiPageText"/></method></id></id>
+
+            <resource name="page">
+                <resource name="info">
+                    <method type="get"><service name="org.moqui.impl.WikiServices.get#WikiPageInfo"/></method>
+                    <id name="wikiPageId"><method type="get">
+                        <service name="org.moqui.impl.WikiServices.get#WikiPageInfoById"/></method></id>
+                </resource>
+            </resource>
+        </resource>
+    </resource>
+
     <!-- TODO: caches, TODO will need services implemented as uses API directly for most ops -->
 </resource>
diff --git a/base-component/webroot/build.gradle b/base-component/webroot/build.gradle
index d0419612d..5229a54d1 100644
--- a/base-component/webroot/build.gradle
+++ b/base-component/webroot/build.gradle
@@ -17,22 +17,14 @@ import java.nio.charset.StandardCharsets
 buildscript {
     repositories {
         mavenCentral()
-        maven { url "https://plugins.gradle.org/m2/" }
+        gradlePluginPortal()
+    }
+    dependencies {
+        classpath 'com.github.ben-manes:gradle-versions-plugin:0.42.0'
+        classpath "org.gradle-webtools.minify:gradle-minify-plugin:1.3.1"
     }
-    dependencies { classpath 'com.github.ben-manes:gradle-versions-plugin:0.28.0' }
-}
-
-/* gradle.js plugin getting warning with Gradle 5+, incompatible with Gradle 6:
-
-   Internal API constructor FactoryNamedDomainObjectContainerConstructor AbstractNamedDomainObjectContainer(Class<T>, Instantiator)
-   has been deprecated. This is scheduled to be removed in Gradle 6.0. Don't use internal API
-
-   see https://github.com/eriwen/gradle-js-plugin/issues/168
- */
-plugins {
-    id "com.eriwen.gradle.js" version "2.14.1"
 }
-
+apply plugin: "org.gradlewebtools.minify"
 apply plugin: 'com.github.ben-manes.versions'
 dependencyUpdates.resolutionStrategy = { componentSelection { rules -> rules.all { ComponentSelection selection ->
     boolean rejected = ['alpha', 'beta', 'rc', 'cr', 'm', 'b'].any { qualifier -> selection.candidate.version ==~ /(?i).*[.-]${qualifier}[.\d-].*/ }
@@ -155,7 +147,6 @@ baseJs.add(libsPath + '/jquery-validate/jquery.validate.min.js')
 baseJs.add(libsPath + '/jquery-validate/additional-methods.min.js')
 // Date/Time (Moment, bootstrap-datetimepicker)
 baseJs.add(libsPath + '/moment.js/moment-with-locales.min.js')
-//baseJs.add(libsPath + '/bootstrap-datetimepicker/js/bootstrap-datetimepicker.min.js')
 baseJs.add(webrootPath + '/js/bootstrap-datetimepicker.min.js')
 // Drop-down (Select2, Selectivity)
 baseJs.add(webrootPath + '/js/select2.min.js')
@@ -185,78 +176,68 @@ vuetJs.add(webrootPath + '/js/http-vue-loader/httpVueLoader.js')
 // Vue root component instance, in footer so runs after page loaded
 vuetJs.add(webrootPath + '/js/WebrootVue.min.js')
 
-
-task minifySelect2(type: com.eriwen.gradle.js.tasks.MinifyJsTask) {
-    source = file("${webrootPath}/js/select2/select2.js")
-    dest = file("${webrootPath}/js/select2.min.js")
-    closure { compilerOptions.setOutputCharset(StandardCharsets.UTF_8) }
-}
-task minifyDateTimePicker(type: com.eriwen.gradle.js.tasks.MinifyJsTask) {
-    source = file("${webrootPath}/js/bootstrap-datetimepicker/bootstrap-datetimepicker.js")
-    dest = file("${webrootPath}/js/bootstrap-datetimepicker.min.js")
-    closure { compilerOptions.setOutputCharset(StandardCharsets.UTF_8) }
-}
-/* using pre-minified version
-task minifyQzTray(type: com.eriwen.gradle.js.tasks.MinifyJsTask) {
-    source = file("${webrootPath}/js/qz-tray/qz-tray.js")
-    dest = file("${webrootPath}/js/qz-tray.min.js")
-    closure { compilerOptions.setOutputCharset(StandardCharsets.UTF_8); warningLevel = 'QUIET' }
-}
-*/
-task minifyMoquiLib(type: com.eriwen.gradle.js.tasks.MinifyJsTask) {
-    source = file("${webrootPath}/js/MoquiLib.js")
-    dest = file("${webrootPath}/js/MoquiLib.min.js")
-    closure { compilerOptions.setOutputCharset(StandardCharsets.UTF_8) }
+task minifyJsDir(type: org.gradlewebtools.minify.JsMinifyTask) {
+    // see: https://github.com/gradle-webtools/gradle-minify-plugin
+    // NOTE: JsMinifyTask (and the css one, etc) always recursively minify in sub-directories, no way to disable! (based on source review 2022-04-05)
+    srcDir = file(webrootPath + "/js")
+    dstDir = file(webrootPath + "/js")
+    options.ignoreMinFiles = true
+    options.emitUseStrict = false
+    options.strictModeInput = false
+    options.compilationLevel = com.google.javascript.jscomp.CompilationLevel.SIMPLE_OPTIMIZATIONS
+    options.env = com.google.javascript.jscomp.CompilerOptions.Environment.BROWSER
+    options.warningLevel = com.google.javascript.jscomp.WarningLevel.QUIET
+    options.charset = StandardCharsets.UTF_8
+    // because all sub-directories are processed for js files to minify, move and remove manually to clean up here...
+    doLast {
+        // move the two min files we want
+        file(webrootPath + '/js/bootstrap-datetimepicker/bootstrap-datetimepicker.min.js')
+                .renameTo(file(webrootPath + '/js/bootstrap-datetimepicker.min.js'))
+        file(webrootPath + '/js/select2/select2.min.js')
+                .renameTo(file(webrootPath + '/js/select2.min.js'))
+        // delete the min files we don't need/want
+        file(webrootPath + '/js/http-vue-loader/httpVueLoader.min.js').delete()
+        file(webrootPath + '/js/qz-tray/MoquiQzComponent.min.js').delete()
+    }
 }
-task combineBaseJs(type: com.eriwen.gradle.js.tasks.CombineJsTask) {
+task combineBaseJs {
     dependsOn downloadFiles
-    dependsOn minifySelect2
-    dependsOn minifyDateTimePicker
-    dependsOn minifyMoquiLib
-    encoding = "UTF-8"
-    source = baseJs
-    dest = file("${webrootPath}/js/CombinedBase.min.js")
-}
-// moment.js and many others have lots of comments, etc that make it very large so re-minify
-/* issues have been found in certain browsers on certain operating systems with this, see https://github.com/moqui/moqui-runtime/issues/76
-task minifyCombinedBase(type: com.eriwen.gradle.js.tasks.MinifyJsTask) {
-    dependsOn combineBaseJs
-    source = file("${webrootPath}/js/CombinedBase.min.js")
-    dest = file("${webrootPath}/js/CombinedBaseMin.min.js")
-    closure {
-        warningLevel = 'QUIET'
-        compilerOptions.setOutputCharset(StandardCharsets.UTF_8)
+    dependsOn minifyJsDir
+    // dependsOn minifySelect2
+    // dependsOn minifyDateTimePicker
+    doLast {
+        def destFile = file("${webrootPath}/js/CombinedBase.min.js")
+        destFile.write("")
+        baseJs.each({
+            destFile.append(file(it).getText("UTF-8"), "UTF-8")
+            destFile.append("\n")
+        })
     }
 }
-*/
-
-task minifyWebrootVue(type: com.eriwen.gradle.js.tasks.MinifyJsTask) {
-    source = file("${webrootPath}/js/WebrootVue.js")
-    dest = file("${webrootPath}/js/WebrootVue.min.js")
-    closure { compilerOptions.setOutputCharset(StandardCharsets.UTF_8) }
-}
-task combineVuetJs(type: com.eriwen.gradle.js.tasks.CombineJsTask) {
+task combineVuetJs {
     dependsOn downloadFiles
-    dependsOn minifyWebrootVue
-    encoding = "UTF-8"
-    source = vuetJs
-    dest = file("${webrootPath}/js/CombinedVuet.min.js")
-}
-
-task minifyWebrootVueQvt(type: com.eriwen.gradle.js.tasks.MinifyJsTask) {
-    source = file("${webrootPath}/js/WebrootVue.qvt.js")
-    dest = file("${webrootPath}/js/WebrootVue.qvt.min.js")
-    closure { compilerOptions.setOutputCharset(StandardCharsets.UTF_8) }
+    dependsOn minifyJsDir
+    doLast {
+        def destFile = file("${webrootPath}/js/CombinedVuet.min.js")
+        destFile.write("")
+        vuetJs.each({
+            destFile.append(file(it).getText("UTF-8"), "UTF-8")
+            destFile.append("\n")
+        })
+    }
 }
 
-task clean { doLast { delete fileTree(dir: "${webrootPath}/js", include: '*.min.js') }}
 task build {
     dependsOn downloadFiles
+
+    dependsOn minifyJsDir
+
     dependsOn combineBaseJs
-    // issues seen with this on Windows, disabling for now: dependsOn minifyCombinedBase
     dependsOn combineVuetJs
-    dependsOn minifyWebrootVueQvt
 }
+task clean { doLast {
+    delete fileTree(dir: "${webrootPath}/js", include: '*.min.js')
+}}
 task cleanAll { doLast {
     delete file(libsPath)
 } }
diff --git a/base-component/webroot/component.xml b/base-component/webroot/component.xml
index f0b3fc878..4edb8748a 100644
--- a/base-component/webroot/component.xml
+++ b/base-component/webroot/component.xml
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<component xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/moqui-conf-2.1.xsd"
+<component xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/moqui-conf-3.xsd"
         name="webroot" version="${moqui_version}"/>
diff --git a/base-component/webroot/data/WebrootSecurityDemoData.xml b/base-component/webroot/data/WebrootSecurityDemoData.xml
index 64eeb6685..2afe6c4c0 100644
--- a/base-component/webroot/data/WebrootSecurityDemoData.xml
+++ b/base-component/webroot/data/WebrootSecurityDemoData.xml
@@ -22,6 +22,7 @@ along with this software (see the LICENSE.md file). If not, see
             passwordHint="framework name, lowercase" currencyUomId="USD" locale="en_US" timeZone="US/Central"
             emailAddress="john.doe@moqui.org"/>
     <moqui.security.UserGroupMember userGroupId="ADMIN" userId="EX_JOHN_DOE" fromDate="1265184000000"/>
+    <moqui.security.UserGroupMember userGroupId="ADMIN_ADV" userId="EX_JOHN_DOE" fromDate="1265184000000"/>
     <moqui.security.UserPermission userPermissionId="ExamplePerm" description="Example Permission"/>
     <moqui.security.UserGroupPermission userGroupId="ADMIN" userPermissionId="ExamplePerm"
             fromDate="1265184000000" thruDate=""/>
diff --git a/base-component/webroot/screen/includes/WebrootVue.qvt.ftl b/base-component/webroot/screen/includes/WebrootVue.qvt.ftl
index 76a3ed738..004000b06 100644
--- a/base-component/webroot/screen/includes/WebrootVue.qvt.ftl
+++ b/base-component/webroot/screen/includes/WebrootVue.qvt.ftl
@@ -18,6 +18,8 @@ along with this software (see the LICENSE.md file). If not, see
     <input type="hidden" id="confBasePath" value="${ec.web.servletContext.contextPath}/apps">
     <input type="hidden" id="confLinkBasePath" value="${ec.web.servletContext.contextPath}/qapps">
     <input type="hidden" id="confUserId" value="${ec.user.userId!''}">
+    <input type="hidden" id="confUsername" value="${ec.user.username!''}">
+    <#-- TODO get secondFactorRequired (org.moqui.impl.UserServices.get#UserAuthcFactorRequired with userId) -->
     <input type="hidden" id="confLocale" value="${ec.user.locale.toLanguageTag()}">
     <input type="hidden" id="confDarkMode" value="${ec.user.getPreference("QUASAR_DARK")!"false"}">
     <input type="hidden" id="confLeftOpen" value="${ec.user.getPreference("QUASAR_LEFT_OPEN")!"false"}">
@@ -139,13 +141,15 @@ along with this software (see the LICENSE.md file). If not, see
                         </q-card-section>
                         <q-separator vertical></q-separator>
                         <q-card-actions vertical class="justify-around q-px-md">
-                            <#-- dark/light switch -->
-                            <q-btn flat dense @click.prevent="switchDarkLight()" icon="invert_colors">
-                                <q-tooltip>${ec.l10n.localize("Switch Dark/Light")}</q-tooltip></q-btn>
                             <#-- logout button -->
                             <q-btn flat dense icon="settings_power" color="negative" type="a" href="${sri.buildUrl("/Login/logout").url}"
                                    onclick="return confirm('${ec.l10n.localize("Logout")} ${(ec.user.userAccount.userFullName)!''}?')">
                                 <q-tooltip>${ec.l10n.localize("Logout")} ${(ec.user.userAccount.userFullName)!''}</q-tooltip></q-btn>
+                            <#-- dark/light switch -->
+                            <q-btn flat dense @click.prevent="switchDarkLight()" icon="invert_colors">
+                                <q-tooltip>${ec.l10n.localize("Switch Dark/Light")}</q-tooltip></q-btn>
+                            <#-- re-login button -->
+                            <q-btn flat dense icon="autorenew" color="negative" @click="reLoginShowDialog"><q-tooltip>Re-Login</q-tooltip></q-btn>
                         </q-card-actions>
                     </q-card-section>
                 </q-card></q-menu>
@@ -169,6 +173,32 @@ along with this software (see the LICENSE.md file). If not, see
             </#list>
         </q-footer>
     </q-layout>
+    <#-- re-login dialog -->
+    <m-dialog v-model="reLoginShow" width="400" title="${ec.l10n.localize("Re-Login")}">
+        <div v-if="reLoginMfaData">
+            <div style="text-align:center;padding-bottom:10px">User <strong>{{username}}</strong> requires an authentication code, you have these options:</div>
+            <div style="text-align:center;padding-bottom:10px">{{reLoginMfaData.factorTypeDescriptions.join(", ")}}</div>
+            <q-form @submit.prevent="reLoginVerifyOtp" autocapitalize="off" autocomplete="off">
+                <q-input v-model="reLoginOtp" name="code" type="password" :autofocus="true" :noPassToggle="false"
+                         outlined stack-label label="${ec.l10n.localize("Authentication Code")}"></q-input>
+                <q-btn outline no-caps color="primary" type="submit" label="${ec.l10n.localize("Sign in")}"></q-btn>
+            </q-form>
+            <div v-for="sendableFactor in reLoginMfaData.sendableFactors" style="padding:8px">
+                <q-btn outline no-caps dense
+                       :label="'${ec.l10n.localize("Send code to")} ' + sendableFactor.factorOption"
+                       @click.prevent="reLoginSendOtp(sendableFactor.factorId)"></q-btn>
+            </div>
+        </div>
+        <div v-else>
+            <div style="text-align:center;padding-bottom:10px">Please sign in to continue as user <strong>{{username}}</strong></div>
+            <q-form @submit.prevent="reLoginSubmit" autocapitalize="off" autocomplete="off">
+                <q-input v-model="reLoginPassword" name="password" type="password" :autofocus="true"
+                         outlined stack-label label="${ec.l10n.localize("Password")}"></q-input>
+                <q-btn outline no-caps color="primary" type="submit" label="${ec.l10n.localize("Sign in")}"></q-btn>
+                <q-btn outline no-caps color="negative" @click.prevent="reLoginReload" label="${ec.l10n.localize("Reload Page")}"></q-btn>
+            </q-form>
+        </div>
+    </m-dialog>
 </div>
 
 <script>
diff --git a/base-component/webroot/screen/webroot.xml b/base-component/webroot/screen/webroot.xml
index 5cdb89ef2..da315c825 100644
--- a/base-component/webroot/screen/webroot.xml
+++ b/base-component/webroot/screen/webroot.xml
@@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication
 along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         require-authentication="false">
     <!-- NOTE: require-authentication=false is required to allow sub-screens to decide, and because the Login screen is below this. -->
     <always-actions>
diff --git a/base-component/webroot/screen/webroot/ChangePassword.xml b/base-component/webroot/screen/webroot/ChangePassword.xml
index 261f03ef4..c4ac86b39 100644
--- a/base-component/webroot/screen/webroot/ChangePassword.xml
+++ b/base-component/webroot/screen/webroot/ChangePassword.xml
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-include="false" require-authentication="false">
 
     <transition name="changePassword">
diff --git a/base-component/webroot/screen/webroot/Login.xml b/base-component/webroot/screen/webroot/Login.xml
index 2fca1b377..dbbd11501 100644
--- a/base-component/webroot/screen/webroot/Login.xml
+++ b/base-component/webroot/screen/webroot/Login.xml
@@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication
 along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-include="false" require-authentication="false" history="false">
 
     <parameter name="initialTab"/>
diff --git a/base-component/webroot/screen/webroot/SecondFactor.xml b/base-component/webroot/screen/webroot/SecondFactor.xml
index 3f071222a..737fa4028 100644
--- a/base-component/webroot/screen/webroot/SecondFactor.xml
+++ b/base-component/webroot/screen/webroot/SecondFactor.xml
@@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication
 along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-include="false" require-authentication="anonymous-all" history="false">
 
     <transition name="sendOtp">
diff --git a/base-component/webroot/screen/webroot/apps.xml b/base-component/webroot/screen/webroot/apps.xml
index f5e4c6156..56b49a4b0 100644
--- a/base-component/webroot/screen/webroot/apps.xml
+++ b/base-component/webroot/screen/webroot/apps.xml
@@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication
 along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         require-authentication="false" screen-theme-type-enum-id="STT_INTERNAL" default-menu-title="Applications">
     <!-- NOTE: require-authentication=false is required to allow sub-screens to decide. -->
 
diff --git a/base-component/webroot/screen/webroot/apps/AppList.xml b/base-component/webroot/screen/webroot/apps/AppList.xml
index e3c3139a8..d1a3ab4f1 100644
--- a/base-component/webroot/screen/webroot/apps/AppList.xml
+++ b/base-component/webroot/screen/webroot/apps/AppList.xml
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         require-authentication="true" default-menu-include="false" default-menu-title="App List">
 
     <actions>
diff --git a/base-component/webroot/screen/webroot/apps/ScreenTree.xml b/base-component/webroot/screen/webroot/apps/ScreenTree.xml
index a757befbc..452810fb6 100644
--- a/base-component/webroot/screen/webroot/apps/ScreenTree.xml
+++ b/base-component/webroot/screen/webroot/apps/ScreenTree.xml
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         require-authentication="true" default-menu-include="false" default-menu-title="Site Map">
 
     <parameter name="showAll"/>
diff --git a/base-component/webroot/screen/webroot/apps/ScreenTree/ScreenTreeNested.xml b/base-component/webroot/screen/webroot/apps/ScreenTree/ScreenTreeNested.xml
index 3d7b2ec6b..a8c1a4661 100644
--- a/base-component/webroot/screen/webroot/apps/ScreenTree/ScreenTreeNested.xml
+++ b/base-component/webroot/screen/webroot/apps/ScreenTree/ScreenTreeNested.xml
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         require-authentication="false" default-menu-include="false">
 
     <actions>
diff --git a/base-component/webroot/screen/webroot/echopath.xml b/base-component/webroot/screen/webroot/echopath.xml
index 3c3ed968a..a35b4cab7 100644
--- a/base-component/webroot/screen/webroot/echopath.xml
+++ b/base-component/webroot/screen/webroot/echopath.xml
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         require-authentication="false" screen-theme-type-enum-id="STT_INTERNAL"
         track-artifact-hit="false" standalone="true" allow-extra-path="true" default-menu-include="false">
 
diff --git a/base-component/webroot/screen/webroot/error.xml b/base-component/webroot/screen/webroot/error.xml
index d5b8015a0..7faf43928 100644
--- a/base-component/webroot/screen/webroot/error.xml
+++ b/base-component/webroot/screen/webroot/error.xml
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         require-authentication="false" screen-theme-type-enum-id="STT_ERROR" default-menu-include="false">
     <pre-actions><script><![CDATA[
         html_stylesheets.add('/libs/twitter-bootstrap/css/bootstrap.min.css')
diff --git a/base-component/webroot/screen/webroot/error/Forbidden.xml b/base-component/webroot/screen/webroot/error/Forbidden.xml
index e9e4d3142..a556ce60c 100644
--- a/base-component/webroot/screen/webroot/error/Forbidden.xml
+++ b/base-component/webroot/screen/webroot/error/Forbidden.xml
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         require-authentication="false">
     <widgets>
         <render-mode><text type="html"><![CDATA[
diff --git a/base-component/webroot/screen/webroot/error/InternalError.xml b/base-component/webroot/screen/webroot/error/InternalError.xml
index 64f90033c..95b1cb29c 100644
--- a/base-component/webroot/screen/webroot/error/InternalError.xml
+++ b/base-component/webroot/screen/webroot/error/InternalError.xml
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         require-authentication="false">
     <widgets>
         <render-mode><text type="html"><![CDATA[
diff --git a/base-component/webroot/screen/webroot/error/NotFound.xml b/base-component/webroot/screen/webroot/error/NotFound.xml
index 5a3503beb..c1e90e454 100644
--- a/base-component/webroot/screen/webroot/error/NotFound.xml
+++ b/base-component/webroot/screen/webroot/error/NotFound.xml
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         require-authentication="false">
     <widgets>
         <render-mode><text type="html"><![CDATA[
diff --git a/base-component/webroot/screen/webroot/error/TooMany.xml b/base-component/webroot/screen/webroot/error/TooMany.xml
index 1faf2dcc8..a88386d0c 100644
--- a/base-component/webroot/screen/webroot/error/TooMany.xml
+++ b/base-component/webroot/screen/webroot/error/TooMany.xml
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         require-authentication="false">
     <widgets>
         <render-mode><text type="html"><![CDATA[
diff --git a/base-component/webroot/screen/webroot/error/Unauthorized.xml b/base-component/webroot/screen/webroot/error/Unauthorized.xml
index 386d31aac..ecd7516a4 100644
--- a/base-component/webroot/screen/webroot/error/Unauthorized.xml
+++ b/base-component/webroot/screen/webroot/error/Unauthorized.xml
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         require-authentication="false">
     <widgets>
         <render-mode><text type="html"><![CDATA[
diff --git a/base-component/webroot/screen/webroot/js/WebrootVue.js b/base-component/webroot/screen/webroot/js/WebrootVue.js
index 5443e49ab..42710614a 100644
--- a/base-component/webroot/screen/webroot/js/WebrootVue.js
+++ b/base-component/webroot/screen/webroot/js/WebrootVue.js
@@ -606,12 +606,12 @@ Vue.component('m-form', {
             // console.log("changed? " + changed + " node " + targetDom.nodeName + " type " + targetEl.attr("type") + " " + targetEl.attr("name") + " to " + targetDom.value + " default " + targetDom.defaultValue);
             // console.log(targetDom.defaultValue);
             if (changed) {
-                this.fieldsChanged[targetEl.attr("name")] = true;
+                this.$set(this.fieldsChanged, targetEl.attr("name"), true);
                 targetEl.parents(".form-group").children("label").addClass("is-changed");
                 targetEl.parents(".form-group").find(".select2-selection").addClass("is-changed");
                 targetEl.addClass("is-changed");
             } else {
-                this.fieldsChanged[targetEl.attr("name")] = false;
+                this.$set(this.fieldsChanged, targetEl.attr("name"), false);
                 targetEl.parents(".form-group").children("label").removeClass("is-changed");
                 targetEl.parents(".form-group").find(".select2-selection").removeClass("is-changed");
                 targetEl.removeClass("is-changed");
@@ -1281,7 +1281,14 @@ moqui.webrootVue = new Vue({
             }
         },
         setParameters: function(parmObj) {
-            if (parmObj) { this.$root.currentParameters = $.extend({}, this.$root.currentParameters, parmObj); }
+            if (parmObj) {
+                this.$root.currentParameters = $.extend({}, this.$root.currentParameters, parmObj);
+                // no path change so just need to update parameters on most recent history item
+                var curUrl = this.currentLinkUrl;
+                var curHistoryItem = this.navHistoryList[0];
+                curHistoryItem.pathWithParams = curUrl;
+                window.history.pushState(null, curHistoryItem.title || '', curUrl);
+            }
             this.$root.reloadSubscreens();
         },
         addSubscreen: function(saComp) {
@@ -1393,7 +1400,8 @@ moqui.webrootVue = new Vue({
 
             // update history and document.title
             var newTitle = (par ? par.title + ' - ' : '') + cur.title;
-            var curUrl = cur.pathWithParams; var questIdx = curUrl.indexOf("?");
+            var curUrl = cur.pathWithParams;
+            var questIdx = curUrl.indexOf("?");
             if (questIdx > 0) {
                 var excludeKeys = ["pageIndex", "orderBySelect", "orderByField", "moquiSessionToken"];
                 var parmList = curUrl.substring(questIdx+1).split("&");
@@ -1410,7 +1418,7 @@ moqui.webrootVue = new Vue({
                     if (eqIdx > 0) {
                         var key = parm.substring(0, eqIdx);
                         var value = parm.substring(eqIdx + 1);
-                        if (key.indexOf("_op") > 0 || key.indexOf("_not") > 0 || key.indexOf("_ic") > 0 || excludeKeys.indexOf(key) > 0 || key === value) continue;
+                        if (key.indexOf("_op") > 0 || key.indexOf("_not") > 0 || key.indexOf("_ic") > 0 || excludeKeys.indexOf(key) >= 0 || key === value) continue;
                         if (titleParms.length > 0) titleParms += ", ";
                         titleParms += decodeURIComponent(value);
                         dpCount++;
@@ -1456,7 +1464,7 @@ moqui.webrootVue = new Vue({
             get: function() { return moqui.objToSearch(this.currentParameters); },
             set: function(newSearch) { this.currentParameters = moqui.searchToObj(newSearch); }
         },
-        currentLinkUrl: function() { var srch = this.currentSearch; return this.currentLinkPath + (srch.length > 0 ? '?' + srch : ''); },
+        currentLinkUrl: function() { var search = this.currentSearch; return this.currentLinkPath + (search.length > 0 ? '?' + search : ''); },
         basePathSize: function() { return this.basePath.split('/').length - this.appRootPath.split('/').length; },
         ScreenTitle: function() { return this.navMenuList.length > 0 ? this.navMenuList[this.navMenuList.length - 1].title : ""; },
         documentMenuList: function() {
diff --git a/base-component/webroot/screen/webroot/js/WebrootVue.qvt.js b/base-component/webroot/screen/webroot/js/WebrootVue.qvt.js
index 120286974..f6871f698 100644
--- a/base-component/webroot/screen/webroot/js/WebrootVue.qvt.js
+++ b/base-component/webroot/screen/webroot/js/WebrootVue.qvt.js
@@ -106,26 +106,36 @@ moqui.handleAjaxError = function(jqXHR, textStatus, errorThrown, responseText) {
     } else {
         if (respObj && moqui.isPlainObject(respObj)) {
             notified = moqui.notifyMessages(respObj.messageInfos, respObj.errors, respObj.validationErrors);
-            // console.log("got here notified ", notified);
         } else if (resp && moqui.isString(resp) && resp.length) {
             notified = moqui.notifyMessages(resp);
         }
     }
 
-    // reload on 401 (Unauthorized) so server can remember current URL and redirect to login screen
+    // reload on 401 (Unauthorized) so server can remember current URL and redirect to login screen, or show re-login dialog to maintain the client app context
     if (jqXHR.status === 401) {
-        if (moqui.webrootVue) { window.location.href = moqui.webrootVue.currentLinkUrl; } else { window.location.reload(true); }
+        if (moqui.webrootVue && moqui.webrootVue.reLoginCheckShow) {
+            // window.location.href = moqui.webrootVue.currentLinkUrl;
+            // instead of reloading the web page, show the Re-Login dialog
+            moqui.webrootVue.reLoginCheckShow();
+        } else {
+            window.location.reload(true);
+        }
     } else if (jqXHR.status === 0) {
         if (errorThrown.indexOf('abort') < 0) {
             var msg = 'Could not connect to server';
             moqui.webrootVue.$q.notify($.extend({}, moqui.notifyOptsError, { message:msg }));
             moqui.webrootVue.addNotify(msg, 'negative');
         }
-    } else if (!notified) {
-        console.log("got here 2 notified ", notified);
-        var errMsg = 'Error: ' + errorThrown + ' (' + textStatus + ')';
-        moqui.webrootVue.$q.notify($.extend({}, moqui.notifyOptsError, { message:errMsg }));
-        moqui.webrootVue.addNotify(errMsg, 'negative');
+    } else {
+        if (moqui.webrootVue && moqui.webrootVue.getCsrfToken) {
+            // update the moqui session token if it has changed
+            moqui.webrootVue.getCsrfToken(jqXHR);
+        }
+        if (!notified) {
+            var errMsg = 'Error: ' + errorThrown + ' (' + textStatus + ')';
+            moqui.webrootVue.$q.notify($.extend({}, moqui.notifyOptsError, { message:errMsg }));
+            moqui.webrootVue.addNotify(errMsg, 'negative');
+        }
     }
 };
 /* Override moqui.notifyGrowl */
@@ -697,7 +707,11 @@ Vue.component('m-form', {
                 setTimeout(function() { $btn.prop('disabled', false); }, 3000);
             }
             var formData = Object.keys(this.fields).length ? new FormData() : new FormData(this.$refs.qForm.$el);
-            $.each(this.fields, function(key, value) { formData.set(key, value || ""); });
+            $.each(this.fields, function(key, value) {
+                if (moqui.isArray(value)) {
+                    value.forEach(function(v) {formData.append(key, v);});
+                } else { formData.set(key, value || ""); }
+            });
 
             var fieldsToRemove = [];
             // NOTE: using iterator directly to avoid using 'for of' which requires more recent ES version (for minify, browser compatibility)
@@ -807,7 +821,7 @@ Vue.component('m-form', {
                 if (resp.screenUrl && resp.screenUrl.length > 0) { this.$root.setUrl(resp.screenUrl); }
                 else if (resp.redirectUrl && resp.redirectUrl.length > 0) { window.location.href = resp.redirectUrl; }
             } else { console.warn('m-form no response or non-JSON response: ' + JSON.stringify(resp)) }
-            var hideId = this.submitHideId; if (hideId && hideId.length > 0) { $('#' + hideId).modal('hide'); }
+            var hideId = this.submitHideId; if (hideId && hideId.length > 0) { this.$root.hideContainer(hideId); }
             var reloadId = this.submitReloadId; if (reloadId && reloadId.length > 0) { this.$root.reloadContainer(reloadId); }
             var subMsg = this.submitMessage;
             if (subMsg && subMsg.length) {
@@ -918,7 +932,9 @@ Vue.component('m-form-link', {
                 // NOTE: with q-input mask place holder is underscore, look for 2; this will cause issues if a valid user input starts with 2 underscores, may need better approach here and in m-form
                 // console.warn("m-form-link submit fields key " + key + " value " + value + " is mask placeholder " + (moqui.isString(value) && value.startsWith("__")));
                 if (moqui.isString(value) && value.startsWith("__")) return;
-                formData.set(key, value);
+                if (moqui.isArray(value)) {
+                    value.forEach(function(v) {formData.append(key, v);});
+                } else { formData.set(key, value); }
             } });
 
             var extraList = [];
@@ -1508,6 +1524,7 @@ Vue.component('m-drop-down', {
                 // doesn't work, q-form submit() doesn't like this event for whatever reason, method missing on it: vm.$nextTick(function() { console.log("calling parent submit with event"); console.log(vm.$parent); vm.$parent.submit($event); });
 
                 // TODO: find a better approach, perhaps pass down a reference to m-form or something so can refer to it more explicitly and handle Vue components in between
+                // TODO: if found a better approach change the removeValue method below
                 // this assumes the grandparent is m-form, if not it will blow up... alternatives are tricky
                 vm.$nextTick(function() { vm.$parent.$parent.submitForm(); });
             }
@@ -1692,6 +1709,18 @@ Vue.component('m-drop-down', {
                 if (valueEntry !== value) newValueArr.push(valueEntry);
             }
             if (curValueArr.length !== newValueArr.length) this.$emit('input', newValueArr);
+            // copied from handleInput method above
+            if (this.submitOnSelect) {
+                var vm = this;
+                // this doesn't work, even alternative of custom-event with event handler in DefaultScreenMacros.qvt.ftl in the drop-down macro that explicitly calls the q-form submit() method: vm.$nextTick(function() { console.log("emitting submit"); vm.$emit('submit'); });
+                // doesn't work, q-form submit() method blows up without an even, in spite of what docs say: vm.$nextTick(function() { console.log("calling parent submit"); console.log(vm.$parent); vm.$parent.submit(); });
+                // doesn't work, q-form submit() doesn't like this event for whatever reason, method missing on it: vm.$nextTick(function() { console.log("calling parent submit with event"); console.log(vm.$parent); vm.$parent.submit($event); });
+
+                // TODO: find a better approach, perhaps pass down a reference to m-form or something so can refer to it more explicitly and handle Vue components in between
+                // TODO: if found a better approach change the handleInput method above
+                // this assumes the grandparent is m-form, if not it will blow up... alternatives are tricky
+                vm.$nextTick(function() { vm.$parent.$parent.submitForm(); });
+            }
         },
         clearAll: function() { this.$emit('input', null); }
     },
@@ -2058,8 +2087,9 @@ moqui.webrootVue = new Vue({
     data: { basePath:"", linkBasePath:"", currentPathList:[], extraPathList:[], currentParameters:{}, bodyParameters:null,
         activeSubscreens:[], navMenuList:[], navHistoryList:[], navPlugins:[], accountPlugins:[], notifyHistoryList:[],
         lastNavTime:Date.now(), loading:0, currentLoadRequest:null, activeContainers:{}, urlListeners:[],
-        moquiSessionToken:"", appHost:"", appRootPath:"", userId:"", locale:"en",
-        notificationClient:null, qzVue:null, leftOpen:false, moqui:moqui },
+        moquiSessionToken:"", appHost:"", appRootPath:"", userId:"", username:"", locale:"en",
+        reLoginShow:false, reLoginPassword:null, reLoginMfaData:null, reLoginOtp:null,
+        notificationClient:null, sessionTokenBc:null, qzVue:null, leftOpen:false, moqui:moqui },
     methods: {
         setUrl: function(url, bodyParameters, onComplete) {
             // cancel current load if needed
@@ -2128,7 +2158,14 @@ moqui.webrootVue = new Vue({
                 hash:'', query:this.currentParameters, params:this.bodyParameters||{}, fullPath:this.currentLinkUrl, matched:[] };
         },
         setParameters: function(parmObj) {
-            if (parmObj) { this.$root.currentParameters = $.extend({}, this.$root.currentParameters, parmObj); }
+            if (parmObj) {
+                this.$root.currentParameters = $.extend({}, this.$root.currentParameters, parmObj);
+                // no path change so just need to update parameters on most recent history item
+                var curUrl = this.currentLinkUrl;
+                var curHistoryItem = this.navHistoryList[0];
+                curHistoryItem.pathWithParams = curUrl;
+                window.history.pushState(null, curHistoryItem.title || '', curUrl);
+            }
             this.$root.reloadSubscreens();
         },
         addSubscreen: function(saComp) {
@@ -2171,6 +2208,9 @@ moqui.webrootVue = new Vue({
             if (contComp) { contComp.reload(); } else { console.error("Container with ID " + contId + " not found, not reloading"); }},
         loadContainer: function(contId, url) { var contComp = this.activeContainers[contId];
             if (contComp) { contComp.load(url); } else { console.error("Container with ID " + contId + " not found, not loading url " + url); }},
+        hideContainer: function(contId) {
+            var contComp = this.activeContainers[contId];
+            if (contComp) { contComp.hide(); } else { console.error("Container with ID " + contId + " not found, not hidding"); }},
 
         addNavPlugin: function(url) { var vm = this; moqui.loadComponent(this.appRootPath + url, function(comp) { vm.navPlugins.push(comp); }) },
         addNavPluginsWait: function(urlList, urlIndex) { if (urlList && urlList.length > urlIndex) {
@@ -2227,12 +2267,124 @@ moqui.webrootVue = new Vue({
             if (this.appRootPath && this.appRootPath.length && path.indexOf(this.appRootPath) !== 0) path = this.appRootPath + path;
             var pathList = path.split('/');
             // element 0 in array after split is empty string from leading '/'
-            var wrapperIdx = this.appRootPath.split('/').length; // appRootPath is '/moqui/v1' or '/moqui'. wrapper means 'qapps'
+            var wrapperIdx = this.appRootPath.split('/').length;
+            // appRootPath is '/moqui/v1' or '/moqui'. wrapper means 'qapps'
             pathList[wrapperIdx] = this.linkBasePath.split('/').slice(-1);
             path = pathList.join("/");
             return path;
         },
-        getQuasarColor: function(bootstrapColor) { return moqui.getQuasarColor(bootstrapColor); }
+        getQuasarColor: function(bootstrapColor) { return moqui.getQuasarColor(bootstrapColor); },
+        // Re-Login Functions
+        getCsrfToken: function(jqXHR) {
+            // update the session token, new session after login (along with xhrFields:{withCredentials:true} for cookie)
+            var sessionToken = jqXHR.getResponseHeader("X-CSRF-Token");
+            if (sessionToken && sessionToken.length && sessionToken !== this.moquiSessionToken) {
+                console.log("Updating session token from jqXHR, sending to BroadcastChannel")
+                this.moquiSessionToken = sessionToken;
+                this.sessionTokenBc.postMessage(sessionToken);
+            }
+        },
+        receiveBcCsrfToken: function(event) {
+            var sessionToken = event.data;
+            if (sessionToken && sessionToken.length && this.moquiSessionToken !== sessionToken) {
+                console.log("Updating session token from BroadcastChannel")
+                this.moquiSessionToken = sessionToken;
+            }
+        },
+        reLoginCheckShow: function() {
+            this.reLoginShowDialog();
+            /* NOTE DEJ-2022-12 removing use of the userInfo endpoint which is commented out for security reasons:
+            // before showing the Re-Login dialog do a GET request without session token to see if there is a new one
+            $.ajax({ type:'GET', url:(this.appRootPath + '/rest/userInfo'),
+                error:this.reLoginCheckResponseError, success:this.reLoginCheckResponseSuccess,
+                dataType:'json', headers:{Accept:'application/json'}, xhrFields:{withCredentials:true} });
+
+             */
+        },
+        /* NOTE DEJ-2022-12 removing use of the userInfo endpoint which is commented out for security reasons:
+        reLoginCheckResponseSuccess: function(resp, status, jqXHR) {
+            if (resp.username && resp.sessionToken) {
+                this.moquiSessionToken = resp.sessionToken;
+                // show success notification, add to notify history
+                var msg = 'Session refreshed after login in another tab, no changes made, please try again';
+                // show for 12 seconds because we want it to show longer than the no user authenticated notification which shows for 15 seconds (minus some password typing time)
+                this.$q.notify({ timeout:10000, type:'warning', message:msg });
+                this.addNotify(msg, 'warning');
+            } else {
+                this.reLoginShowDialog();
+            }
+        },
+        reLoginCheckResponseError: function(jqXHR, textStatus, errorThrown, responseText) {
+            if (jqXHR.status === 401) {
+                this.reLoginShowDialog();
+            } else {
+                var resp = responseText ? responseText : jqXHR.responseText;
+                var respObj;
+                try { respObj = JSON.parse(resp); } catch (e) { } // ignore error, don't always expect it to be JSON
+                if (respObj && moqui.isPlainObject(respObj)) {
+                    moqui.notifyMessages(respObj.messageInfos, respObj.errors, respObj.validationErrors);
+                } else if (resp && moqui.isString(resp) && resp.length) {
+                    moqui.notifyMessages(resp);
+                }
+            }
+        },
+        */
+        reLoginShowDialog: function() {
+            // make sure there is no MFA Data (would skip the login with password step)
+            this.reLoginMfaData = null;
+            this.reLoginOtp = null;
+            this.reLoginShow = true;
+        },
+        reLoginPostLogin: function() {
+            // clear password/etc, hide relogin dialog
+            this.reLoginShow = false;
+            this.reLoginPassword = null;
+            this.reLoginOtp = null;
+            this.reLoginMfaData = null;
+            // show success notification, add to notify history
+            var msg = 'Background login successful';
+            // show for 12 seconds because we want it to show longer than the no user authenticated notification which shows for 15 seconds (minus some password typing time)
+            this.$q.notify({ timeout:12000, type:'positive', message:msg });
+            this.addNotify(msg, 'positive');
+        },
+        reLoginSubmit: function() {
+            $.ajax({ type:'POST', url:(this.appRootPath + '/rest/login'), error:moqui.handleAjaxError, success:this.reLoginHandleResponse,
+                dataType:'json', headers:{Accept:'application/json'}, xhrFields:{withCredentials:true},
+                data:{ username:this.username, password:this.reLoginPassword } });
+        },
+        reLoginHandleResponse: function(resp, status, jqXHR) {
+            // console.warn("re-login response: " + JSON.stringify(resp));
+            this.getCsrfToken(jqXHR);
+            if (resp.secondFactorRequired) {
+                this.reLoginMfaData = resp;
+            } else if (resp.loggedIn) {
+                this.reLoginPostLogin();
+            }
+        },
+        reLoginReload: function () {
+            if (confirm("Reload page? All changes will be lost."))
+                window.location.href = this.currentLinkUrl;
+        },
+        reLoginSendOtp: function(factorId) {
+            $.ajax({ type:'POST', url:(this.appRootPath + '/rest/sendOtp'), error:moqui.handleAjaxError, success:this.reLoginSendOtpResponse,
+                dataType:'json', headers:{Accept:'application/json'}, xhrFields:{withCredentials:true},
+                data:{ moquiSessionToken:this.moquiSessionToken, factorId:factorId } });
+        },
+        reLoginSendOtpResponse: function(resp, status, jqXHR) {
+            // console.warn("re-login send otp response: " + JSON.stringify(resp));
+            if (resp) moqui.notifyMessages(resp.messages, resp.errors, resp.validationErrors);
+        },
+        reLoginVerifyOtp: function() {
+            $.ajax({ type:'POST', url:(this.appRootPath + '/rest/verifyOtp'), error:moqui.handleAjaxError, success:this.reLoginVerifyOtpResponse,
+                dataType:'json', headers:{Accept:'application/json'}, xhrFields:{withCredentials:true},
+                data:{ moquiSessionToken:this.moquiSessionToken, code:this.reLoginOtp } });
+        },
+        reLoginVerifyOtpResponse: function(resp, status, jqXHR) {
+            this.getCsrfToken(jqXHR);
+            if (resp.loggedIn) {
+                this.reLoginPostLogin();
+            }
+        }
     },
     watch: {
         navMenuList: function(newList) { if (newList.length > 0) {
@@ -2250,7 +2402,8 @@ moqui.webrootVue = new Vue({
 
             // update history and document.title
             var newTitle = (par ? par.title + ' - ' : '') + cur.title;
-            var curUrl = cur.pathWithParams; var questIdx = curUrl.indexOf("?");
+            var curUrl = cur.pathWithParams;
+            var questIdx = curUrl.indexOf("?");
             if (questIdx > 0) {
                 var excludeKeys = ["pageIndex", "orderBySelect", "orderByField", "moquiSessionToken"];
                 var parmList = curUrl.substring(questIdx+1).split("&");
@@ -2267,7 +2420,7 @@ moqui.webrootVue = new Vue({
                     if (eqIdx > 0) {
                         var key = parm.substring(0, eqIdx);
                         var value = parm.substring(eqIdx + 1);
-                        if (key.indexOf("_op") > 0 || key.indexOf("_not") > 0 || key.indexOf("_ic") > 0 || excludeKeys.indexOf(key) > 0 || key === value) continue;
+                        if (key.indexOf("_op") > 0 || key.indexOf("_not") > 0 || key.indexOf("_ic") > 0 || excludeKeys.indexOf(key) >= 0 || key === value) continue;
                         if (titleParms.length > 0) titleParms += ", ";
                         titleParms += decodeURIComponent(value);
                         dpCount++;
@@ -2313,7 +2466,7 @@ moqui.webrootVue = new Vue({
             get: function() { return moqui.objToSearch(this.currentParameters); },
             set: function(newSearch) { this.currentParameters = moqui.searchToObj(newSearch); }
         },
-        currentLinkUrl: function() { var srch = this.currentSearch; return this.currentLinkPath + (srch.length > 0 ? '?' + srch : ''); },
+        currentLinkUrl: function() { var search = this.currentSearch; return this.currentLinkPath + (search.length > 0 ? '?' + search : ''); },
         basePathSize: function() { return this.basePath.split('/').length - this.appRootPath.split('/').length; },
         ScreenTitle: function() { return this.navMenuList.length > 0 ? this.navMenuList[this.navMenuList.length - 1].title : ""; },
         documentMenuList: function() {
@@ -2330,6 +2483,7 @@ moqui.webrootVue = new Vue({
         this.appHost = $("#confAppHost").val(); this.appRootPath = $("#confAppRootPath").val();
         this.basePath = $("#confBasePath").val(); this.linkBasePath = $("#confLinkBasePath").val();
         this.userId = $("#confUserId").val();
+        this.username = $("#confUsername").val();
         this.locale = $("#confLocale").val(); if (moqui.localeMap[this.locale]) this.locale = moqui.localeMap[this.locale];
         this.leftOpen = $("#confLeftOpen").val() === 'true';
 
@@ -2337,6 +2491,9 @@ moqui.webrootVue = new Vue({
         this.$q.dark.set(confDarkMode === "true");
 
         this.notificationClient = new moqui.NotificationClient((location.protocol === 'https:' ? 'wss://' : 'ws://') + this.appHost + this.appRootPath + "/notws");
+        // open BroadcastChannel to share session token between tabs/windows on the same domain (see https://developer.mozilla.org/en-US/docs/Web/API/Broadcast_Channel_API)
+        this.sessionTokenBc = new BroadcastChannel("SessionToken");
+        this.sessionTokenBc.onmessage = this.receiveBcCsrfToken;
 
         var navPluginUrlList = [];
         $('.confNavPluginUrl').each(function(idx, el) { navPluginUrlList.push($(el).val()); });
@@ -2364,6 +2521,9 @@ moqui.webrootVue = new Vue({
                 }
             });
         }
+    },
+    beforeDestroy: function() {
+        this.sessionTokenBc.close();
     }
 
 });
diff --git a/base-component/webroot/screen/webroot/js/http-vue-loader/httpVueLoader.js b/base-component/webroot/screen/webroot/js/http-vue-loader/httpVueLoader.js
index 22bffc25f..16e3fa2fc 100644
--- a/base-component/webroot/screen/webroot/js/http-vue-loader/httpVueLoader.js
+++ b/base-component/webroot/screen/webroot/js/http-vue-loader/httpVueLoader.js
@@ -1,3 +1,5 @@
+// for differences from stock http-vue-loader see: https://github.com/FranckFreiburger/http-vue-loader/compare/master...jonesde:master
+// NOTE: under the <script> element use the approach: <script>module.exports = {};</script> and not like <script>export default {};</script>
 (function umd(root,factory){
 	if(typeof module==='object' && typeof exports === 'object' )
 		module.exports=factory()
diff --git a/base-component/webroot/screen/webroot/qapps.xml b/base-component/webroot/screen/webroot/qapps.xml
index 7ff3adb34..291e04dc9 100644
--- a/base-component/webroot/screen/webroot/qapps.xml
+++ b/base-component/webroot/screen/webroot/qapps.xml
@@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication
 along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         require-authentication="false" screen-theme-type-enum-id="STT_INTERNAL_QUASAR" default-menu-title="Applications" allow-extra-path="true">
     <!-- NOTE: require-authentication=false so no permission required but in pre-actions if no user logged in goes to login screen -->
 
diff --git a/base-component/webroot/screen/webroot/rest.xml b/base-component/webroot/screen/webroot/rest.xml
index ca607a0aa..cd747c603 100644
--- a/base-component/webroot/screen/webroot/rest.xml
+++ b/base-component/webroot/screen/webroot/rest.xml
@@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication
 along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         require-authentication="false" track-artifact-hit="false" default-menu-include="false">
     <!-- NOTE: require-authentication=false is required to allow transitions to decide. -->
 
@@ -29,15 +29,16 @@ along with this software (see the LICENSE.md file). If not, see
     -->
 
     <!-- login: for client applications that use a Moqui UserAccount -->
-    <transition name="login" require-session-token="false">
+    <transition name="login" method="post" require-session-token="false">
         <!-- NOTE: login is a transition here instead of a Service REST endpoint under /rest/s1/moqui/... as a special case to not require session token -->
         <parameter name="username" required="true"/>
         <parameter name="password" required="true"/>
         <parameter name="code"/>
         <actions>
             <set field="loggedIn" from="ec.user.loginUser(username, password)"/>
+            <if condition="ec.message.hasError()"><script>ec.web.sendJsonResponse([loggedIn:false])</script></if>
 
-            <if condition="ec.web.sessionAttributes.moquiAuthcFactorRequired">
+            <if condition="ec.web.sessionAttributes.moquiAuthcFactorRequired"><then>
                 <if condition="code"><then>
                     <service-call name="org.moqui.impl.UserServices.validate#ExternalUserAuthcCode"
                             in-map="[code:code]" out-map="validateOut"/>
@@ -48,31 +49,36 @@ along with this software (see the LICENSE.md file). If not, see
                         <message type="danger" public="true">Authentication code is not valid</message>
                     </else></if>
                 </then></if>
+
                 <!-- if we didn't return above send back info about user's authc factors -->
-                <service-call name="org.moqui.impl.UserServices.get#ExternalUserAuthcFactorInfo" web-send-json-response="true"/>
-            </if>
+                <service-call name="org.moqui.impl.UserServices.get#ExternalUserAuthcFactorInfo" out-map="factorInfoOut"/>
+                <script>ec.web.sendJsonResponse(factorInfoOut)</script>
+            </then><else>
+                <script>ec.web.sendJsonResponse([loggedIn:loggedIn])</script>
+            </else></if>
         </actions>
         <default-response type="none"/>
     </transition>
     <!-- sendOtp: ask the server to send a one-time password/code (via email, SMS, etc);
             a user must be pre-authenticated via login and must own the UserAuthcFactor record specified with factorId;
             factorId can be UserAccountEmail IFF user has no active authc factors configured -->
-    <transition name="sendOtp">
+    <transition name="sendOtp" method="post">
         <parameter name="factorId" required="true"/>
         <service-call name="org.moqui.impl.UserServices.send#ExternalAuthcCode" in-map="[factorId:factorId]"
                 web-send-json-response="true"/>
         <default-response type="none"/>
     </transition>
     <!-- verifyOtp: submit an OTP code for pre-authenticated user (via login) to complete login -->
-    <transition name="verifyOtp">
+    <transition name="verifyOtp" method="post">
         <parameter name="code" required="true"/>
         <actions>
             <service-call name="org.moqui.impl.UserServices.validate#ExternalUserAuthcCode"
                     in-map="[code:code]" out-map="validateOut"/>
             <if condition="validateOut.verified"><then>
-                <script>ec.user.internalLoginUser(validateOut.username)</script>
+                <set field="loggedIn" from="ec.user.internalLoginUser(validateOut.username)"/>
+                <script>ec.web.sendJsonResponse([loggedIn:loggedIn])</script>
             </then><else>
-                <script>ec.web.sendError(403, "Authentication code is not valid")</script>
+                <script>ec.web.sendError(403, ec.l10n.localize("Authentication code is not valid"))</script>
             </else></if>
         </actions>
         <default-response type="none"/>
@@ -85,6 +91,29 @@ along with this software (see the LICENSE.md file). If not, see
         </script></actions>
         <default-response type="none"/>
     </transition>
+    <!-- NOTE DEJ-2022-12 commented for security reasons described below, is not a critical hole and
+            requires a script injection sort of attack to exploit, but is generally more secure to
+            ONLY make the session token available on the FIRST request where it is generated
+            (ie after login, logout, session timeout, other session changes)
+    <transition name="userInfo" method="get" read-only="true">
+        <actions><script>
+            if (ec.user.username) {
+                // SECURITY NOTE: this returns the session token, used for multiple tabs/windows where
+                //   the session cookie for new session is updated by login in another tab so we have a
+                //   session cookie but not the token; this may need to be removed and another solution
+                //   found (if possible) for auto re-login in a tab after a user authc'ed in another tab
+                //   because this might open an attack vector and make the session token less helpful
+                //   for CSRF protection
+                ec.web.sendJsonResponse([ username:ec.user.username, userId:ec.user.userId, currencyUomId:ec.user.currencyUomId,
+                    timeZone:ec.user.timeZone?.toString(), locale:ec.user.locale?.toString(), sessionToken:ec.web.getSessionToken() ])
+            } else {
+                ec.web.sendJsonResponse([ username:null, userId:null, currencyUomId:ec.user.currencyUomId,
+                    timeZone:ec.user.timeZone?.toString(), locale:ec.user.locale?.toString() ])
+            }
+        </script></actions>
+        <default-response type="none"/>
+    </transition>
+    -->
 
     <!--
     EXAMPLES
diff --git a/base-component/webroot/screen/webroot/rpc.xml b/base-component/webroot/screen/webroot/rpc.xml
index aaacf5427..bbaee29e4 100644
--- a/base-component/webroot/screen/webroot/rpc.xml
+++ b/base-component/webroot/screen/webroot/rpc.xml
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         require-authentication="false" track-artifact-hit="false" default-menu-include="false">
     <!-- NOTE: require-authentication=false is required to allow transitions to decide. -->
 
diff --git a/base-component/webroot/screen/webroot/vapps.xml b/base-component/webroot/screen/webroot/vapps.xml
index 4aeef3d6d..3a2524df9 100644
--- a/base-component/webroot/screen/webroot/vapps.xml
+++ b/base-component/webroot/screen/webroot/vapps.xml
@@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication
 along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         require-authentication="false" screen-theme-type-enum-id="STT_INTERNAL" default-menu-title="Applications" allow-extra-path="true">
     <!-- NOTE: require-authentication=false so no permission required but in pre-actions if no user logged in goes to login screen -->
 
diff --git a/base-component/webroot/service/webroot/LocaleServices.xml b/base-component/webroot/service/webroot/LocaleServices.xml
index f70ee8d40..712afda7e 100644
--- a/base-component/webroot/service/webroot/LocaleServices.xml
+++ b/base-component/webroot/service/webroot/LocaleServices.xml
@@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication
 along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/service-definition-2.1.xsd">
+<services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/service-definition-3.xsd">
 
     <service verb="get" noun="ValidateLocaleScripts" authenticate="anonymous-view">
         <in-parameters><parameter name="locale" type="java.util.Locale" default="ec.user.locale"/></in-parameters>
diff --git a/base-component/webroot/template/screen/BasicTransitions.xml b/base-component/webroot/template/screen/BasicTransitions.xml
index e96ca0037..7c7186a7f 100644
--- a/base-component/webroot/template/screen/BasicTransitions.xml
+++ b/base-component/webroot/template/screen/BasicTransitions.xml
@@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication
 along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-include="false">
 
     <!-- NOTE: this screen is not meant to be rendered, it is just a library of transitions and sections to include -->
diff --git a/base-component/webroot/template/screen/BasicWidgetTemplates.xml b/base-component/webroot/template/screen/BasicWidgetTemplates.xml
index e65f59755..b48e2d020 100644
--- a/base-component/webroot/template/screen/BasicWidgetTemplates.xml
+++ b/base-component/webroot/template/screen/BasicWidgetTemplates.xml
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <widget-templates xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd">
+        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd">
 
     <widget-template name="enumDropDown">
         <drop-down allow-empty="${allowEmpty ?: 'false'}" no-current-selected-key="${noCurrentSelectedKey?:''}"
diff --git a/conf/MoquiDevConf.xml b/conf/MoquiDevConf.xml
index 61cc09207..c74876868 100644
--- a/conf/MoquiDevConf.xml
+++ b/conf/MoquiDevConf.xml
@@ -3,7 +3,7 @@
 
 <!-- NOTE: for default settings, examples, and comments see the MoquiDefaultConf.xml file at
     https://github.com/moqui/moqui-framework/blob/master/framework/src/main/resources/MoquiDefaultConf.xml -->
-<moqui-conf xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/moqui-conf-2.1.xsd">
+<moqui-conf xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/moqui-conf-3.xsd">
 
     <default-property name="instance_purpose" value="dev"/>
     <default-property name="webapp_allow_origins" value="*"/>
diff --git a/conf/MoquiLoadTestConf.xml b/conf/MoquiLoadTestConf.xml
index d731f1910..34c4504e4 100644
--- a/conf/MoquiLoadTestConf.xml
+++ b/conf/MoquiLoadTestConf.xml
@@ -3,7 +3,7 @@
 
 <!-- NOTE: for default settings, examples, and comments see the MoquiDefaultConf.xml file at
     https://github.com/moqui/moqui-framework/blob/master/framework/src/main/resources/MoquiDefaultConf.xml -->
-<moqui-conf xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/moqui-conf-2.1.xsd">
+<moqui-conf xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/moqui-conf-3.xsd">
 
     <server-stats stats-skip-condition="pathInfo?.startsWith('/rpc') || pathInfo?.startsWith('/rest') || pathInfo?.startsWith('/status')"/>
 
diff --git a/conf/MoquiProductionConf.xml b/conf/MoquiProductionConf.xml
index b44ae98a8..2177fbb98 100644
--- a/conf/MoquiProductionConf.xml
+++ b/conf/MoquiProductionConf.xml
@@ -3,7 +3,7 @@
 
 <!-- NOTE: for default settings, examples, and comments see the MoquiDefaultConf.xml file at
     https://github.com/moqui/moqui-framework/blob/master/framework/src/main/resources/MoquiDefaultConf.xml -->
-<moqui-conf xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/moqui-conf-2.1.xsd">
+<moqui-conf xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/moqui-conf-3.xsd">
 
     <server-stats stats-skip-condition="pathInfo?.startsWith('/rpc') || pathInfo?.startsWith('/rest') || pathInfo?.startsWith('/status')"/>
 
diff --git a/template/screen-macro/DefaultScreenMacros.html.ftl b/template/screen-macro/DefaultScreenMacros.html.ftl
index 60359ba11..9e68d56da 100644
--- a/template/screen-macro/DefaultScreenMacros.html.ftl
+++ b/template/screen-macro/DefaultScreenMacros.html.ftl
@@ -401,6 +401,8 @@ ${sri.renderIncludeScreen(.node["@location"], .node["@share-scope"]!)}
         <#if linkText?has_content || linkNode["image"]?has_content || linkNode["@icon"]?has_content>
             <#if linkNode["@encode"]! != "false"><#assign linkText = linkText?html></#if>
             <#assign urlInstance = sri.makeUrlByType(linkNode["@url"], linkNode["@url-type"]!"transition", linkNode, linkNode["@expand-transition-url"]!"true")>
+            <#if linkNode["@pass-through-parameters"]! == "true">
+                <#assign urlInstance = urlInstance.addPassThroughParameters(sri.getScreenUrlInstance())></#if>
             <#assign linkDivId><@nodeId .node/></#assign>
             <@linkFormForm linkNode linkDivId linkText urlInstance/>
             <@linkFormLink linkNode linkDivId linkText urlInstance/>
@@ -593,8 +595,7 @@ ${sri.renderIncludeScreen(.node["@location"], .node["@share-scope"]!)}
         <#if lastUpdatedString?has_content><input type="hidden" name="lastUpdatedStamp" value="${lastUpdatedString}"></#if>
     </#if>
     <#if formNode["@pass-through-parameters"]! == "true">
-        <#assign currentFindUrl = sri.getScreenUrlInstance().cloneUrlInstance().removeParameter("moquiFormName").removeParameter("moquiSessionToken").removeParameter("lastStandalone").removeParameter("formListFindId")>
-        <#assign currentFindUrlParms = currentFindUrl.getParameterMap()>
+        <#assign currentFindUrlParms = sri.getScreenUrlInstance().getPassThroughParameterMap()>
         <#list currentFindUrlParms.keySet() as parmName><#if !formInstance.getFieldNode(parmName)??>
             <input type="hidden" name="${parmName}" value="${currentFindUrlParms.get(parmName)!?html}">
         </#if></#list>
diff --git a/template/screen-macro/DefaultScreenMacros.qvt.ftl b/template/screen-macro/DefaultScreenMacros.qvt.ftl
index 087664c7d..3ec5cfc17 100644
--- a/template/screen-macro/DefaultScreenMacros.qvt.ftl
+++ b/template/screen-macro/DefaultScreenMacros.qvt.ftl
@@ -224,6 +224,8 @@ ${sri.renderIncludeScreen(.node["@location"], .node["@share-scope"]!)}
         <#if linkText?has_content || linkNode["image"]?has_content || linkNode["@icon"]?has_content>
             <#if linkNode["@encode"]! != "false"><#assign linkText = linkText?html></#if>
             <#assign urlInstance = sri.makeUrlByType(linkNode["@url"], linkNode["@url-type"]!"transition", linkNode, linkNode["@expand-transition-url"]!"true")>
+            <#if linkNode["@pass-through-parameters"]! == "true">
+                <#assign urlInstance = urlInstance.addPassThroughParameters(sri.getScreenUrlInstance())></#if>
             <#assign linkDivId><@nodeId .node/></#assign>
             <@linkFormForm linkNode linkDivId linkText urlInstance/>
             <@linkFormLink linkNode linkDivId linkText urlInstance/>
@@ -1887,8 +1889,9 @@ a => A, d => D, y => Y
 <#macro file>
     <#assign curFieldName><@fieldName .node/></#assign>
     <#assign fieldLabel><@fieldTitle .node?parent/></#assign>
+    <#assign acceptText = ec.getResource().expand(.node.@accept, "")>
     <q-file dense outlined<#if fieldLabel?has_content> stack-label label="${fieldLabel}"</#if><#if fieldsJsName?has_content> v-model="${fieldsJsName}.${curFieldName}"</#if><#if formDisabled!> disable</#if>
-            name="<@fieldName .node/>" size="${.node.@size!"30"}"<#if .node.@multiple! == "true"> multiple</#if><#if .node.@accept?has_content> accept="${.node.@accept}"</#if><#if .node.@maxlength?has_content> maxlength="${.node.@maxlength}"</#if><#if ownerForm?has_content> form="${ownerForm}"</#if>>
+            name="<@fieldName .node/>" size="${.node.@size!"30"}"<#if .node.@multiple! == "true"> multiple</#if><#if .node.@accept?has_content> accept="${acceptText}"</#if><#if .node.@maxlength?has_content> maxlength="${.node.@maxlength}"</#if><#if ownerForm?has_content> form="${ownerForm}"</#if>>
         <#if .node?parent["@tooltip"]?has_content><q-tooltip>${ec.getResource().expand(.node?parent["@tooltip"], "")}</q-tooltip></#if>
     </q-file>
 </#macro>
diff --git a/template/screen-macro/DefaultScreenMacros.vuet.ftl b/template/screen-macro/DefaultScreenMacros.vuet.ftl
index 62df76faf..c3ea2ce00 100644
--- a/template/screen-macro/DefaultScreenMacros.vuet.ftl
+++ b/template/screen-macro/DefaultScreenMacros.vuet.ftl
@@ -213,6 +213,8 @@ ${sri.renderIncludeScreen(.node["@location"], .node["@share-scope"]!)}
         <#if linkText?has_content || linkNode["image"]?has_content || linkNode["@icon"]?has_content>
             <#if linkNode["@encode"]! != "false"><#assign linkText = linkText?html></#if>
             <#assign urlInstance = sri.makeUrlByType(linkNode["@url"], linkNode["@url-type"]!"transition", linkNode, linkNode["@expand-transition-url"]!"true")>
+            <#if linkNode["@pass-through-parameters"]! == "true">
+                <#assign urlInstance = urlInstance.addPassThroughParameters(sri.getScreenUrlInstance())></#if>
             <#assign linkDivId><@nodeId .node/></#assign>
             <@linkFormForm linkNode linkDivId linkText urlInstance/>
             <@linkFormLink linkNode linkDivId linkText urlInstance/>
@@ -404,8 +406,7 @@ ${sri.renderIncludeScreen(.node["@location"], .node["@share-scope"]!)}
         <#if lastUpdatedString?has_content><input type="hidden" name="lastUpdatedStamp" value="${lastUpdatedString}"></#if>
     </#if>
     <#if formSingleNode["@pass-through-parameters"]! == "true">
-        <#assign currentFindUrl = sri.getScreenUrlInstance().cloneUrlInstance().removeParameter("moquiFormName").removeParameter("moquiSessionToken").removeParameter("lastStandalone").removeParameter("formListFindId")>
-        <#assign currentFindUrlParms = currentFindUrl.getParameterMap()>
+        <#assign currentFindUrlParms = sri.getScreenUrlInstance().getPassThroughParameterMap()>
         <#list currentFindUrlParms.keySet() as parmName><#if !formInstance.getFieldNode(parmName)??>
             <input type="hidden" name="${parmName}" value="${currentFindUrlParms.get(parmName)!?html}">
         </#if></#list>