diff --git a/CHANGELOG.md b/CHANGELOG.md
index 10dfa970..c2dcc420 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [4.0.7] - 2023-05-01
+
+### Fixed
+
+-   Default dependency bug
+-   nested placeholder expressions
+
 ## [4.0.5] - 2023-04-15
 
 ### Added
@@ -463,7 +470,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 -   Allow change password for current local user
 -   Start tracking versions
 
-[Unreleased]: https://github.com/ansibleguy76/ansibleforms/compare/4.0.5...HEAD
+[Unreleased]: https://github.com/ansibleguy76/ansibleforms/compare/4.0.7...HEAD
+
+[4.0.7]: https://github.com/ansibleguy76/ansibleforms/compare/4.0.5...4.0.7
 
 [4.0.5]: https://github.com/ansibleguy76/ansibleforms/compare/4.0.3...4.0.5
 
diff --git a/app_versions.gradle b/app_versions.gradle
index 323919ec..561d264d 100644
--- a/app_versions.gradle
+++ b/app_versions.gradle
@@ -1,2 +1,2 @@
-ext.version_code = 40005
-ext.version_name = "4.0.5"
+ext.version_code = 40007
+ext.version_name = "4.0.7"
diff --git a/client/package.json b/client/package.json
index 02a6806b..05ca2e77 100644
--- a/client/package.json
+++ b/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ansible_forms_vue",
-  "version": "4.0.5",
+  "version": "4.0.7",
   "private": true,
   "scripts": {
     "serve": "vue-cli-service serve",
@@ -12,9 +12,9 @@
     "lint": "vue-cli-service lint"
   },
   "dependencies": {
-    "core-js": "~3.29.1",
+    "core-js": "~3.30.1",
     "vue": "~2.6.14",
-    "axios": "~1.3.2",
+    "axios": "~1.3.5",
     "es6-promise": "~4.2.8",
     "vuelidate": "~0.7.7",
     "vue-router": "~3.5.4",
@@ -36,7 +36,7 @@
     "yaml": "1.10.2",
     "thenby": "*",
     "vue-showdown": "2.4.1",
-    "bulma-calendar": "*",
+    "bulma-calendar": "6.1.19",
     "@fortawesome/fontawesome-svg-core":"~6.2.1",
     "@fortawesome/free-solid-svg-icons":"~6.2.1",
     "@fortawesome/free-regular-svg-icons":"~6.2.1",
diff --git a/client/public/assets/_overrides.scss b/client/public/assets/_overrides.scss
index 624df9d7..7ae63139 100644
--- a/client/public/assets/_overrides.scss
+++ b/client/public/assets/_overrides.scss
@@ -1,6 +1,30 @@
 // Overrides
-@if $bulmaswatch-import-font {
-  @import url("https://fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,700italic,400,300,700&display=swap");
+// @if $bulmaswatch-import-font {
+//   @import url("https://fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,700italic,400,300,700&display=swap");
+// }
+
+@font-face {
+  font-family: "Open Sans";
+  src: url("/assets/fonts/OpenSans-Regular.ttf");
+  font-weight: 400;
+  font-style: normal;
+}
+@font-face {
+  font-family: "Open Sans";
+  src: url("/assets/fonts/OpenSans-Italic.ttf");
+  font-weight: 400;
+  font-style: italic;
+}
+@font-face {
+  font-family: "Open Sans";
+  src: url("/assets/fonts/OpenSans-Bold.ttf");
+  font-weight: 700;
+  font-style: normal;
+}
+@font-face {
+  font-family: "Open Sans";
+  src: url("/assets/fonts/OpenSans-Light.ttf");
+  font-weight: 300;
 }
 
 .button {
diff --git a/client/public/assets/fonts/OpenSans-Bold.ttf b/client/public/assets/fonts/OpenSans-Bold.ttf
new file mode 100644
index 00000000..a1398b33
Binary files /dev/null and b/client/public/assets/fonts/OpenSans-Bold.ttf differ
diff --git a/client/public/assets/fonts/OpenSans-Italic.ttf b/client/public/assets/fonts/OpenSans-Italic.ttf
new file mode 100644
index 00000000..790286fe
Binary files /dev/null and b/client/public/assets/fonts/OpenSans-Italic.ttf differ
diff --git a/client/public/assets/fonts/OpenSans-Light.ttf b/client/public/assets/fonts/OpenSans-Light.ttf
new file mode 100644
index 00000000..d9a9e277
Binary files /dev/null and b/client/public/assets/fonts/OpenSans-Light.ttf differ
diff --git a/client/public/assets/fonts/OpenSans-Regular.ttf b/client/public/assets/fonts/OpenSans-Regular.ttf
new file mode 100644
index 00000000..1dc226dd
Binary files /dev/null and b/client/public/assets/fonts/OpenSans-Regular.ttf differ
diff --git a/client/public/assets/fonts/SourceSansPro-Bold.ttf b/client/public/assets/fonts/SourceSansPro-Bold.ttf
deleted file mode 100644
index eb719404..00000000
Binary files a/client/public/assets/fonts/SourceSansPro-Bold.ttf and /dev/null differ
diff --git a/client/public/assets/fonts/SourceSansPro-Italic.ttf b/client/public/assets/fonts/SourceSansPro-Italic.ttf
deleted file mode 100644
index 82e7daaf..00000000
Binary files a/client/public/assets/fonts/SourceSansPro-Italic.ttf and /dev/null differ
diff --git a/client/public/assets/fonts/SourceSansPro-Light.ttf b/client/public/assets/fonts/SourceSansPro-Light.ttf
deleted file mode 100644
index 2aa4aa6a..00000000
Binary files a/client/public/assets/fonts/SourceSansPro-Light.ttf and /dev/null differ
diff --git a/client/public/assets/fonts/SourceSansPro-Regular.ttf b/client/public/assets/fonts/SourceSansPro-Regular.ttf
deleted file mode 100644
index 56238468..00000000
Binary files a/client/public/assets/fonts/SourceSansPro-Regular.ttf and /dev/null differ
diff --git a/client/src/components/BulmaAdvancedSelect.vue b/client/src/components/BulmaAdvancedSelect.vue
index c87b8568..92220ca3 100644
--- a/client/src/components/BulmaAdvancedSelect.vue
+++ b/client/src/components/BulmaAdvancedSelect.vue
@@ -189,13 +189,14 @@ export default {
                   //calculate if we need to do a dropup
                   var dd = ref.$refs["dd"]?.getBoundingClientRect()
                   var dt = ref.$refs["dt"]?.getBoundingClientRect()
-                  var wh = window.innerHeight
-                  var ww = window.innerWidth
-                  // if dropdown is out out of view AND there is space for dropup, do dropup
-                  ref.isUp=((dd.bottom>wh) && (dd.height<(dt.top-100)))
-                  ref.isRight=(dt.left>ww/2)
-                  this.calcDropdownMenuWidth()        
-                  
+                  if(dt){
+                    var wh = window.innerHeight
+                    var ww = window.innerWidth
+                    // if dropdown is out out of view AND there is space for dropup, do dropup
+                    ref.isUp=((dd.bottom>wh) && (dd.height<(dt.top-100)))
+                    ref.isRight=(dt.left>ww/2)
+                    this.calcDropdownMenuWidth()   
+                  }
               })
           }
       },
@@ -210,10 +211,12 @@ export default {
         var columnsCount=this.columns?.length || valueLength
         if(this.horizontal || (columnsCount>1)){
             var dt = this.$refs["dt"]?.getBoundingClientRect()
+            var dtleft = dt?.left||0
+            var dtright = (dt?.right||0)
             var ww = this.containerSize.width
             var wx = this.containerSize.x         
-            var widthIfLeft = (ww+wx-dt.left-25)
-            var widthIfRight = (dt.right-wx-25)
+            var widthIfLeft = (ww+wx-dtleft-25)
+            var widthIfRight = (dtright-wx-25)
             var width=((this.isRight)?widthIfRight:widthIfLeft)
             this.dropdownMenuWidth=width+"px"
         }
@@ -228,8 +231,8 @@ export default {
     },
     mounted() {
         var ref = this
-            // this.$refs.input.blur()
-            // this.$refs.content.blur()
+        // this.$refs.input.blur()
+        // this.$refs.content.blur()
     },
     directives: {
         'click-outside': {
diff --git a/client/src/components/BulmaEditTable.vue b/client/src/components/BulmaEditTable.vue
index 81d8337a..cb3d79b3 100644
--- a/client/src/components/BulmaEditTable.vue
+++ b/client/src/components/BulmaEditTable.vue
@@ -1,7 +1,7 @@
 <template>
     <div>
         <BulmaModal type="large" v-if="showEdit" :title="action" action="Save" @click="saveItem()" @close="showEdit=false" @cancel="showEdit=false">
-          <div v-for="field,index in tableFields" :key="field.name" class="field mt-3">
+          <div v-for="field,index in editFields" :key="field.name" class="field mt-3">
 
               <!-- add field label -->
               <label class="label has-text-dark">{{ field.label }} <span v-if="field.required" class="has-text-danger">*</span></label>
@@ -210,6 +210,7 @@
             deleteMarker:{type: String, default: ""},
             insertMarker:{type: String, default: ""},
             readonlyColumns:{type: Array},
+            insertColumns:{type: Array},
             hasError:{type: Boolean}
         },
         data: function(){
@@ -307,6 +308,9 @@
           //this.input()
         },
         computed: {
+            editFields: function(){
+              return this.tableFields.filter(x => (this.action!="Add" || this.insertColumns.length==0 || this.insertColumns.includes(x.name)))
+            },
             filterRow: function () {
                 return this.tableFields.findIndex( (e) => e.filterable ) >= 0;
             },
diff --git a/client/src/components/BulmaNav.vue b/client/src/components/BulmaNav.vue
index b66ca9fe..6d763ea3 100644
--- a/client/src/components/BulmaNav.vue
+++ b/client/src/components/BulmaNav.vue
@@ -51,8 +51,12 @@
                     <router-link class="navbar-item" to="/profile" v-if="authenticated && profile.type=='local' && profile.id">
                       <span class="icon"><font-awesome-icon icon="key" /></span><span>Change password</span>
                     </router-link>
-                    <router-link class="navbar-item" to="/login" v-on:click.native="logout()" replace><span class="icon"><font-awesome-icon icon="sign-out-alt" /></span><span>Logout</span></router-link>
-                    <span @click="$emit('profile')" class="navbar-item is-clickable"><span class="icon"><font-awesome-icon icon="address-card" /></span> <span>About me</span></span>
+                    <router-link class="navbar-item" to="/login" v-on:click.native="logout()" replace>
+                      <span class="icon"><font-awesome-icon icon="sign-out-alt" /></span><span>Logout</span>
+                    </router-link>
+                    <a href="javascript:void" @click="$emit('profile')" class="navbar-item">
+                      <span class="icon"><font-awesome-icon icon="address-card" /></span> <span>About me</span>
+                    </a>
                   </div>
                 </div>
               </div>
diff --git a/client/src/components/Form.vue b/client/src/components/Form.vue
index 44db00b0..78f0690b 100644
--- a/client/src/components/Form.vue
+++ b/client/src/components/Form.vue
@@ -9,10 +9,10 @@
         </p>
     </BulmaQuickView>
 
-    <div ref="container" class="container">
+    <div class="container">
       <div class="columns" v-if="formIsReady">
         <!-- form column -->
-        <div class="column is-clipped-horizontal">
+        <div ref="container" class="column is-clipped-horizontal">
           <!-- form title -->
           <h1 class="title">{{ currentForm.name }} <span v-if="currentForm.help" class="tag is-light is-clickable" @click="showHelp=!showHelp"><span class="icon has-text-info"><font-awesome-icon icon="question-circle" /></span><span v-if="showHelp">Hide help</span><span v-else>Show help</span></span></h1>
           <!-- help pane -->
@@ -208,6 +208,7 @@
                             :deleteMarker="field.deleteMarker || ''"
                             :insertMarker="field.insertMarker || ''"
                             :readonlyColumns="field.readonlyColumns || []"
+                            :insertColumns="field.insertColumns || []"
                             :isLoading="!['fixed','variable'].includes(dynamicFieldStatus[field.name]) && (field.expression!=undefined || field.query!=undefined)"
                             :values="form[field.name]||[]"
                             @input="evaluateDynamicFields(field.name)"
@@ -225,6 +226,7 @@
                             :type="field.dateType"
                             value-type="format"
                             v-model="$v.form[field.name].$model"
+                            @change="evaluateDynamicFields(field.name)"
                         >
                               <template #input>
                                 <div :class="{'has-icons-left':!!field.icon}" class="control">
@@ -620,20 +622,22 @@
       }      
     },
     methods:{
+      // used for enum field, to know the width of the container
       calcContainerSize(){
         var rect=this.$refs["container"]?.getBoundingClientRect()
         if(rect){
           this.containerSize.x=rect.x
           this.containerSize.width=rect.width
         }
-
       },
+      // create a url with current values in embedded /-> experimental !
       getFormUrl(){
         var base64values=btoa(JSON.stringify(this.form))
         var url=`${location.protocol}//${location.host}/#/form/?form=${encodeURIComponent(this.currentForm.name)}&base64values=${base64values}`
 
         this.clip(url,true)
       },
+      // to execute form events
       doAction(a){
         var ref=this
         const action=Object.keys(a)[0]
@@ -670,6 +674,7 @@
           setTimeout(()=>{ref.hideForm=false},wait*1000)
         }
       },
+      // as the parent to rerender the form vue component
       reloadForm(){
         this.$emit('rerender')
       },
@@ -697,6 +702,7 @@
         Vue.set(this.fieldOptions[fieldname],'debug',value)   // flag editable
       },
       // forces any type to visible string
+      // used to visualize expressions
       stringify(v){
         if(v){
           if(Array.isArray(v)){
@@ -733,7 +739,7 @@
             && (el.hide!==true || ref.showHidden))
         });
       },
-      // creates a list of fields per group
+      // creates a list of fields per group & line
       filterfieldsByGroupAndLine(group,line){
         var ref=this
         return this.filterfieldsByGroup(group).filter(function (el) {
@@ -797,12 +803,18 @@
           }
           // console.log("final => " + result)
           if(result){
-            Vue.set(ref.visibility,field.name,true)
+            ref.setVisibility(field.name,true)
           }else{
-            Vue.set(ref.visibility,field.name,false)
+            ref.setVisibility(field.name,false)
           }
         }
       },
+      setVisibility(fieldname,status){
+        if(this.visibility[fieldname]!=status){
+          Vue.set(this.visibility,fieldname,status)
+          this.resetField(fieldname)
+        }
+      },
       //----------------------------------------------------------------
       // check if an entire group can be shown, based on field depencies
       // hide a group if all fields inside are hidden
@@ -838,18 +850,43 @@
         // reset to default value
         // reset this field status
         // console.log(`[${fieldname}] reset`)
+        this.initiateDefaults(fieldname)
         this.setFieldStatus(fieldname,undefined)
         Vue.set(this.form,fieldname,this.defaults[fieldname])
       },
+      // reset all fields
       resetFields(){
         this.currentForm.fields.forEach((item, i) => {
           this.resetField(item.name)
         });
-
       },
-      // load default value in field
-      defaultField(fieldname){
+      // new in 4.0.5
+      // instead of taking the default value, see if it needs to be evaluated
+      // allowing dynamic defaults
+      getDefaultValue(fieldname,value){
+        if(value!=undefined){
+          var _value = this.replacePlaceholderInString(value).value
+          // console.log(`${fieldname} -> ${value} -> ${_value}`)
+          if(this.fieldOptions[fieldname].evalDefault){
+            var r=undefined
+            try{
+              r=eval(_value)
+              return r
+            }catch(e){
+              console.log(`Error evaluating default value : ${e}`)
+            }
+          }else{
+            return _value
+          }       
+        }else{
+          return value
+        }
+ 
+      },
+      // load default value in field => only for expressions
+      setFieldToDefault(fieldname){
         // reset to default value
+        // console.log(`defaulting ${fieldname}`)
         try{
           // if there is a default, set "default" status
           if(this.defaults[fieldname]!=undefined){
@@ -858,16 +895,20 @@
           else{
             // if no default, set to undefined
             var prevState=this.dynamicFieldStatus[fieldname]
+
             if(prevState=="running"){
+              // console.log(`defaulting ${fieldname}`)
               // if the field was running, don't re-eval, we just did that
               this.setFieldStatus(fieldname,undefined,false)
             }else{
               // if the field was something diff, re-eval
+              // console.log(`defaulting ${fieldname}`)
               this.setFieldStatus(fieldname,undefined,true)
             }
           }
           // set default value
           Vue.set(this.form,fieldname,this.defaults[fieldname])
+         
         }catch(e){
           // this error should not hit, unless we have a bug
           console.log("Error: " + e)
@@ -877,12 +918,14 @@
       // set dynamic field status, only for expressions,query and table
       setFieldStatus(fieldname,status,reeval=true){
         // console.log(`[${fieldname}] ----> ${status}`)
-        var prevState=this.dynamicFieldStatus[fieldname]
-        Vue.set(this.dynamicFieldStatus,fieldname,status)
-        if(reeval && (prevState!=status)){
-          // re-evaluate if need
-          this.evaluateDynamicFields(fieldname)
-        }
+        if(this.fieldOptions[fieldname]?.isDynamic){
+          var prevState=this.dynamicFieldStatus[fieldname]
+          Vue.set(this.dynamicFieldStatus,fieldname,status)
+          if(reeval && (prevState!=status)){
+            // re-evaluate if need
+            this.evaluateDynamicFields(fieldname)
+          }
+        } 
       },
       // if 2 dependend fields (parent-child) both have defaults
       // this can potentially be an issue.
@@ -901,15 +944,17 @@
         }
         return result
       },
+      // new in 4.0.5, we now allow dynamic defaults
       // first time run, load all the default values
-      initiateDefaults(){
+      initiateDefaults(fieldname=undefined){
         var ref=this
-        this.currentForm.fields.forEach((item,i) => {
+        this.currentForm.fields.filter(x => !fieldname || fieldname==x.name).forEach((item,i) => {
           if(item.name in ref.externalData){
             ref.defaults[item.name]=ref.externalData[item.name]
           }else{
-            ref.defaults[item.name]=item.default
-          }
+            // console.log(`defaulting ${item.name} -> ${item.default}`)
+            ref.defaults[item.name]=ref.getDefaultValue(item.name,item.default)
+          }      
         })
       },
       // add warnings for bad table values
@@ -920,8 +965,61 @@
         var i=(data.length>1)?"are":"is"
         this.warnings.push(`<span class="has-text-warning-dark">Table '${name}' has missing data</span><br><span>${c} '${data}' ${i} missing.</span>`)
       },
+      addDynamicFieldDependency(fields,field,foundfield){
+        var ref=this
+        var columnRegex = /([^.]+)\..+/g;                                    // detect a "." in the field
+        var tmpArr=columnRegex.exec(foundfield)                             // found aaa.bbb
+        if(tmpArr && tmpArr.length>0){
+          // console.log("found dot in " + foundfield + " in " + field)
+          foundfield = tmpArr[1]                                            // aaa
+          // console.log(tmpArr)
+        }else{
+          // console.log("found no in " + foundfield + " in " + field)
+        }
+        foundfield=foundfield.replace(/\[[0-9]*\]/,'') // xxx[y] => xxx
+        if(fields.includes(foundfield)){                         // does field xxx exist in our form ?
+          //console.log(foundfield + " is a real field")
+          if(foundfield in ref.dynamicFieldDependencies){															 // did we declare it before ?
+            if(ref.dynamicFieldDependencies[foundfield].indexOf(field) === -1) {  // allready in there ?
+                ref.dynamicFieldDependencies[foundfield].push(field);												 // push it
+                if(foundfield==field){
+                  // we capture self references
+                  ref.warnings.push(`<span class="has-text-warning-dark">'${foundfield}' has a self reference</span><br><span>This will cause a racing condition</span>`)
+                  ref.$toast.error("You defined a self reference on field '"+foundfield+"'")
+                }
+            }
+          }else{
+            ref.dynamicFieldDependencies[foundfield]=[field]
+            if(foundfield==field){
+              // we capture self references
+              ref.warnings.push(`<span class="has-text-warning-dark">'${foundfield}' has a self reference</span><br><span>This will cause a racing condition</span>`)
+              ref.$toast.error("You defined a self reference on field '"+foundfield+"'")
+            }
+          }
+
+        }else{
+          // we capture bad references
+          if(!Object.keys(ref.form).includes(foundfield))
+            ref.warnings.push(`<span class="has-text-warning-dark">'${field}' has a reference to unknown field '${foundfield}'</span><br><span>Your form might not function as expected</span>`)
+        }
+      },
+      getPlaceholderMatches(fields,field,s){
+        var ref=this
+        var matches=[]
+        // console.log(typeof s)
+        if(s && typeof s=="string"){
+          var testRegex = /\$\(([^)]+)\)/g;
+          matches = s.matchAll(testRegex)
+        }
+        for(var match of matches){
+          // foundmatch = match[0];                                              // found $(xxx)
+          var foundfield = match[1];                                              // found xxx
+          ref.addDynamicFieldDependency(fields,field,foundfield)
+        }        
+      },
       // Find variable devDependencies
       // we analyse which fields are dependent on others
+      // if they change, we then know which other fields to re-evaluate
       findVariableDependencies(){
         var ref=this
         var watchdog=0
@@ -941,6 +1039,7 @@
         })
         // do the analysis
         this.currentForm.fields.forEach((item,i) => {
+          // while we are looping, we also check if there are issues
           if(item.dependencies){
             item.dependencies.forEach((dep)=>{
               if(!(fields.includes(dep.name) || ( dep.name.startsWith("!") && fields.includes(dep.name.slice(1))  ))){
@@ -957,55 +1056,17 @@
           if(item.sameAs && !fields.includes(item.sameAs)){
             ref.warnings.push(`<span class="has-text-warning-dark">'${item.name}' has bad 'sameAs' validation</span><br><span>${item.sameAs} is not a valid field name</span>`)
           }
-          if(["expression","query","enum","table"].includes(item.type)){
 
-            // query type is now deprecated
-            if(item.type=='query'){
-              ref.warnings.push(`<span class="has-text-warning-dark">'${item.name}' has the deprecated query type</span><br><span>Use enum type instead.</span>`)            
-            }
-            
-            var testRegex = /\$\(([^)]+)\)/g;
-            var matches=(item.expression || item.query || "").matchAll(testRegex);
-            for(var match of matches){
-              foundmatch = match[0];                                              // found $(xxx)
-              foundfield = match[1];                                              // found xxx
-              var columnRegex = /(.+)\.(.+)/g;                                    // detect a "." in the field
-              var tmpArr=columnRegex.exec(foundfield)                             // found aaa.bbb
-              if(tmpArr && tmpArr.length>0){
-                // console.log("found dot in " + foundfield + " in " + item.name)
-                foundfield = tmpArr[1]                                            // aaa
-              }else{
-                // console.log("found no in " + foundfield + " in " + item.name)
-              }
-              foundfield=foundfield.replace(/\[[0-9]*\]/,'') // xxx[y] => xxx
-              if(fields.includes(foundfield)){                         // does field xxx exist in our form ?
-                //console.log(foundfield + " is a real field")
-                if(foundfield in ref.dynamicFieldDependencies){															 // did we declare it before ?
-                  if(ref.dynamicFieldDependencies[foundfield].indexOf(item.name) === -1) {  // allready in there ?
-                      ref.dynamicFieldDependencies[foundfield].push(item.name);												 // push it
-                      if(foundfield==item.name){
-                        // we capture self references
-                        ref.warnings.push(`<span class="has-text-warning-dark">'${foundfield}' has a self reference</span><br><span>This will cause a racing condition</span>`)
-                        ref.$toast.error("You defined a self reference on field '"+foundfield+"'")
-                      }
-                  }
-                }else{
-                  ref.dynamicFieldDependencies[foundfield]=[item.name]
-                  if(foundfield==item.name){
-                    // we capture self references
-                    ref.warnings.push(`<span class="has-text-warning-dark">'${foundfield}' has a self reference</span><br><span>This will cause a racing condition</span>`)
-                    ref.$toast.error("You defined a self reference on field '"+foundfield+"'")
-                  }
-                }
-
-              }else{
-                // we capture bad references
-                if(!Object.keys(ref.form).includes(foundfield))
-                  ref.warnings.push(`<span class="has-text-warning-dark">'${item.name}' has a reference to unknown field '${foundfield}'</span><br><span>Your form might not function as expected</span>`)
-              }
-            }
+          // query type is now deprecated
+          if(item.type=='query'){
+            ref.warnings.push(`<span class="has-text-warning-dark">'${item.name}' has the deprecated query type</span><br><span>Use enum type instead.</span>`)            
           }
+
+          this.getPlaceholderMatches(fields,item.name,item.expression ?? item.query)
+          this.getPlaceholderMatches(fields,item.name,item.default)
+ 
         })
+        // check self references
         while(!finishedFlag){
           finishedFlag=true
           temp = JSON.parse(JSON.stringify(ref.dynamicFieldDependencies));   // copy dependencies to temp
@@ -1093,15 +1154,18 @@
         var keys = undefined
         var targetflag=undefined
         var hasPlaceholders = false;
+        if(typeof value!=="string"){
+          return {"hasPlaceholders":false,"value":value} 
+        }
         // console.log("item = " + value)
         // console.log(typeof value)
         // console.log(testRegex)
         matches=[...value.matchAll(testRegex)] // force match array
         for(match of matches){
-            //console.log("-> match : " + match[0] + "->" + match[1])
+            // console.log("-> match : " + match[0] + "->" + match[1])
             foundmatch = match[0];                                              // found $(xxx)
             foundfield = match[1];                                              // found xxx
-            var columnRegex = /(.+)\.(.+)/g;                                        // detect a "." in the field
+            var columnRegex = /([^.]+)\.(.+)/g;                                        // detect a "." in the field
             var tmpArr=columnRegex.exec(foundfield)                             // found aaa.bbb
             if(tmpArr && tmpArr.length>0){
               foundfield = tmpArr[1]                                            // aaa
@@ -1116,18 +1180,25 @@
             targetflag = undefined
             // mark the field as a dependent field
             if(foundfield in ref.form){      // does field xxx exist in our form ?
-              if(ref.fieldOptions[foundfield] && ["expression","table"].includes(ref.fieldOptions[foundfield].type) && (typeof ref.form[foundfield]=="object")){
+              // if the field exists
+              // and it's from an expression or table
+              //   or it's deep link in a column (colum has .)
+              // and the reference field is an object
+              if(ref.fieldOptions[foundfield] && (["expression","table"].includes(ref.fieldOptions[foundfield].type)||column.includes(".")) && (typeof ref.form[foundfield]=="object")){
                 // objects and array should be stringified
-                //fieldvalue=JSON.stringify(ref.form[foundfield])
-                //console.log(Helpers.replacePlaceholders(match[1],ref.form))
+                fieldvalue=JSON.stringify(ref.form[foundfield])
+                // console.log(Helpers.replacePlaceholders(match[1],ref.form))
                 fieldvalue=JSON.stringify(Helpers.replacePlaceholders(match[1],ref.form)) // allow full object reference
                 // drop wrapping quotes
                 if(typeof fieldvalue=="string"){ // drop quotes if string
                   fieldvalue=fieldvalue.replace(/^\"+/, '').replace(/\"+$/, ''); // eslint-disable-line
+                }else{
+                  // console.log(typeof fieldvalue)
                 }
+              // in other cases, it's a classic field.column reference
               }else{
                 // other fields, grab a valid value
-                fieldvalue = ref.getFieldValue(ref.form[foundfield],column,true);// get value of xxx
+                fieldvalue = ref.getFieldValue(ref.form[foundfield],column,true);// get value of aaa.bbb
               }
               // get dynamic field status
               if(foundfield in ref.dynamicFieldStatus){
@@ -1304,7 +1375,7 @@
               ref.checkDependencies(item)
               if(ref.visibility[item.name]){  // only if they are visible
                 // if expression and not processed yet or needs to be reprocessed
-                var flag = ref.dynamicFieldStatus[item.name];                     // current field status (running/fixed/variable)
+                var flag = ref.dynamicFieldStatus[item.name];                     // current field status (running/fixed/variable/default)
                 var placeholderCheck=undefined;                                   // result for a placeholder check
                 if(item.expression && (flag==undefined || ref.hasDefaultDependencies(item.name))){                // if expression and not evaluated yet
                   // console.log("eval expression " + item.name)
@@ -1353,10 +1424,10 @@
                           }
                           Vue.delete(ref.queryerrors, item.name);
                         }catch(err){
-                          //console.log("Local eval failed : " + err)
+                          // console.log("Local eval failed : " + err)
                           Vue.set(ref.queryerrors, item.name,err);
                           try{
-                            ref.defaultField(item.name)
+                            ref.setFieldToDefault(item.name)
                           }catch(err){
                             ref.stopLoop("Defaulting " + item.name)
                           }
@@ -1392,7 +1463,7 @@
                               // expression returned undefined, so lets set to default if we have one
                               if(restresult.data.output==undefined && (ref.defaults[item.name]!=undefined)){
                                 if(item.type=="expression"){
-                                  ref.defaultField(item.name)
+                                  ref.setFieldToDefault(item.name)
                                 }else{
                                   ref.resetField(item.name)
                                 }
@@ -1412,7 +1483,7 @@
                           }).catch(function (error) {
                                 // console.log('Error ' + error.message)
                                 try{
-                                  ref.defaultField(item.name)
+                                  ref.setFieldToDefault(item.name)
                                 }catch(err){
                                   ref.stopLoop("Defaulting " + item.name)
                                 }
@@ -1423,7 +1494,7 @@
 
                   }else{
                     // console.log(item.name + " is not evaluated yet");
-                    ref.defaultField(item.name)
+                    ref.setFieldToDefault(item.name)
                   }
                 } else if(item.query && flag==undefined){
                    // console.log("eval query : " + item.name)
@@ -1445,7 +1516,7 @@
                         if(restresult.status=="error"){
                            //console.log(restresult.data.error)
                            if(item.type=="expression"){
-                             ref.defaultField(item.name)
+                             ref.setFieldToDefault(item.name)
                            }else{
                              ref.resetField(item.name)
                            }
@@ -1471,7 +1542,7 @@
                           // console.log('Error ' + err.message)
                           try{
                             if(item.type=="expression"){
-                              ref.defaultField(item.name)
+                              ref.setFieldToDefault(item.name)
                             }else{
                               ref.resetField(item.name)
                             }
@@ -1486,7 +1557,7 @@
                     //console.log(item.name + " is not evaluated yet");
                     try{
                       if(item.type=="expression"){
-                        ref.defaultField(item.name)
+                        ref.setFieldToDefault(item.name)
                       }else{
                         ref.resetField(item.name)
                       }
@@ -1497,7 +1568,7 @@
                 }
               }else{  // not visible field
                 if(item.type=="expression"){
-                  ref.defaultField(item.name)
+                  ref.setFieldToDefault(item.name)
                 }else if(item.type=="query" || item.type=="enum" || item.type=="table"){
                   // console.log("resetting " + item.name)
                   ref.resetField(item.name)
@@ -1573,6 +1644,7 @@
       },
       // trigger this when a field has changed and we need to see if it has an impact.
       evaluateDynamicFields(fieldname) {
+          // console.log(`${fieldname} changed`)
           var ref=this;
           // console.log(`[${fieldname}] eval trigger`)
           // if this field is dependency
@@ -1587,6 +1659,7 @@
                 }
             })
           }
+          this.calcContainerSize();
       },
       // trigger a job abort
       abortJob(id){
@@ -1910,8 +1983,10 @@
             }
             Vue.set(ref.externalData,item.name,queryValue)
           }
+          Vue.set(ref.fieldOptions,item.name,{})                                // storing some easy to find options
+          Vue.set(ref.fieldOptions[item.name],"evalDefault",item.evalDefault??false)
           if(["expression","query","enum","table"].includes(item.type)){
-            Vue.set(ref.fieldOptions,item.name,{})                                // storing some easy to find options
+            Vue.set(ref.fieldOptions[item.name],"isDynamic",!!(item.expression??item.query??false))
             Vue.set(ref.fieldOptions[item.name],"valueColumn",item.valueColumn||"")
             Vue.set(ref.fieldOptions[item.name],"placeholderColumn",item.placeholderColumn||"")
             Vue.set(ref.fieldOptions[item.name],"type",item.type)
@@ -1919,7 +1994,7 @@
             if(item.refresh && typeof item.refresh=='string' && /[0-9]+s/.test(item.refresh)){
               Vue.set(ref.fieldOptions[item.name],"refresh",item.refresh)
             }
-            Vue.set(ref.form,item.name,ref.externalData[item.name]??item.default)
+            Vue.set(ref.form,item.name,ref.externalData[item.name]??this.getDefaultValue(item.name,item.default))
             if(item.type=="table" && !ref.defaults[item.name]){
               Vue.set(ref.form,item.name,[])
             }
@@ -1927,9 +2002,9 @@
               Vue.set(ref.form,item.name,ref.externalData[item.name])
             }
           }else if(["checkbox"].includes(item.type)){
-            Vue.set(ref.form,item.name,ref.externalData[item.name]??item.default??false)
+            Vue.set(ref.form,item.name,ref.externalData[item.name]??this.getDefaultValue(item.name,item.default)??false)
           }else{
-            Vue.set(ref.form,item.name,ref.externalData[item.name]??item.default??"")
+            Vue.set(ref.form,item.name,ref.externalData[item.name]??this.getDefaultValue(item.name,item.default)??"")
           }
           Vue.set(ref.visibility,item.name,true)
         });
diff --git a/client/src/views/Jobs.vue b/client/src/views/Jobs.vue
index 82777fc5..88eb0abb 100644
--- a/client/src/views/Jobs.vue
+++ b/client/src/views/Jobs.vue
@@ -59,7 +59,7 @@
           </thead>
           <tbody>
           <template v-for="j in displayedJobs">
-            <tr :key="j.id" :class="{'has-background-success-light':(j.status=='success' && j.id!=jobId),'has-background-danger-light':(j.status=='failed' && j.id!=jobId),'has-background-warning':(j.status=='approve' && j.id!=jobId),'has-text-black':(j.status=='approve' && j.id!=jobId),'has-background-warning-light':(['aborted','warning','rejected'].includes(j.status) && j.id!=jobId),'has-background-info':j.id==jobId,'has-text-white':j.id==jobId}">
+            <tr :key="j.id" :class="{'has-background-success-light':(j.status=='success' && j.id!=jobId),'has-background-danger-light':(j.status=='failed' && j.id!=jobId),'has-background-warning':(j.status=='approve' && j.id!=jobId),'has-text-black':(j.status=='approve' && j.id!=jobId),'has-background-warning-light':(['aborted','abandoned','warning','rejected'].includes(j.status) && j.id!=jobId),'has-background-info':j.id==jobId,'has-text-white':j.id==jobId}">
               <td class="has-background-info-light">
                 <span v-if="j.status!='running'&&j.status!='aborting'&&j.status!='abort'" class="icon has-text-info is-clickable" @click="tempJobId=j.id;showRelaunch=true" title="Relaunch job"><font-awesome-icon icon="redo" /></span>
                 <span v-if="j.status && (j.status=='running')" class="icon has-text-warning is-clickable" @click="tempJobId=j.id;showAbort=true" title="Abort job"><font-awesome-icon icon="ban" /></span>
@@ -82,7 +82,7 @@
               <td class="is-clickable has-text-left" @click="getJob(j.id)" :title="j.user">{{j.user}} ({{j.user_type}})</td>
             </tr>
             <template v-for="c in childJobs(j.id)">
-              <tr :key="c.id" :class="{'has-background-success-light':(c.status=='success' && c.id!=jobId),'has-background-danger-light':(c.status=='failed' && c.id!=jobId),'has-background-warning-light':((c.status=='aborted'||c.status=='warning') && c.id!=jobId),'has-background-info':c.id==jobId,'has-text-white':c.id==jobId}">
+              <tr :key="c.id" :class="{'has-background-success-light':(c.status=='success' && c.id!=jobId),'has-background-danger-light':(c.status=='failed' && c.id!=jobId),'has-background-warning-light':(['aborted','warning','abandoned'].includes(c.status) && c.id!=jobId),'has-background-info':c.id==jobId,'has-text-white':c.id==jobId}">
                 <td class="has-background-info-light">
                   <!-- <span v-if="isAdmin" class="icon has-text-danger is-clickable" @click="tempJobId=c.id;showDelete=true" title="Delete job"><font-awesome-icon icon="trash-alt" /></span> -->
                 </td>
@@ -262,7 +262,7 @@
         if(status=="running"){
           return "is-info"
         }
-        if(status=="warning" || status=="aborted"){
+        if(status=="warning" || status=="aborted" || status=="abandoned"){
           return "is-warning"
         }
         if(status=="failed"){
diff --git a/server/package.json b/server/package.json
index 6bc5b760..b9ad5847 100644
--- a/server/package.json
+++ b/server/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ansible_forms",
-  "version": "4.0.5",
+  "version": "4.0.7",
   "repository": {
     "type": "git",
     "url": "git://github.com/ansibleguy76/ansibleforms.git"
@@ -17,8 +17,8 @@
     "clean": "rimraf dist"
   },
   "dependencies": {
-    "core-js": "~3.29.1",
-    "axios": "~1.3.2",
+    "core-js": "~3.30.1",
+    "axios": "~1.3.5",
     "cors": "~2.8.5",
     "bcrypt": "~5.1.0",
     "cheerio": "~1.0.0-rc.12",
@@ -30,29 +30,29 @@
     "winston-daily-rotate-file": "~4.7.1",
     "passport": "~0.6.0",
     "modern-passport-http": "~0.3.0",
-    "passport-jwt": "~4.0.0",
+    "passport-jwt": "~4.0.1",
     "@outlinewiki/passport-azure-ad-oauth2": "~0.1.0",
     "mysql2": "~2.3.3",
     "ajv": "~6.12.6",
     "ajv-error-parser": "~1.0.7",
     "lodash": "~4.17.21",
     "bluebird": "~3.7.2",
-    "node-jq": "~2.3.4",
+    "node-jq": "~2.3.5",
     "moment": "~2.29.4",
-    "yaml": "~2.1.3",
+    "yaml": "~2.2.1",
     "cert-info":"~1.5.1",
     "thenby":"~1.3.4",
     "mssql":"~8.1.3",
     "mongodb":"~4.11.0",
-    "pg":"~8.8.0",
+    "pg":"~8.10.0",
     "fs-extra":"~10.1.0",
     "node-cache":"~5.1.2",
-    "ldap-authentication": "~2.3.2",
+    "ldap-authentication": "~2.3.3",
     "ldapjs": "~2.3.3",
     "read-last-lines": "~1.8.0",
-    "swagger-ui-express": "~4.5.0",
-    "nodemailer": "~6.8.0",
-    "nanoid": "~3.3.4"
+    "swagger-ui-express": "~4.6.2",
+    "nodemailer": "~6.9.1",
+    "nanoid": "~3.3.6"
   },
   "devDependencies": {
     "@babel/core": "7.19.1",
diff --git a/server/schema/forms_schema.json b/server/schema/forms_schema.json
index 8a792991..e8bb5e21 100644
--- a/server/schema/forms_schema.json
+++ b/server/schema/forms_schema.json
@@ -896,6 +896,7 @@
                     {"type": "integer"}
                   ]
                 },
+                "evalDefault": {"type": "boolean"},
                 "dateType": {"type": "string","enum":["date","datetime","year","month","time","week"]},
                 "noOutput": {"type": "boolean"},
                 "asCredential": {"type": "boolean"},
@@ -1000,6 +1001,10 @@
                   "type": "array",
                   "items": { "type": "string" }
                 },
+                "insertColumns": {
+                  "type": "array",
+                  "items": { "type": "string" }
+                },                
                 "sticky": {"type": "boolean"},
                 "horizontal": {"type": "boolean"},
                 "editable": {"type": "boolean"},
diff --git a/server/schema/help.yaml b/server/schema/help.yaml
index 79d50193..6e7e5b3e 100644
--- a/server/schema/help.yaml
+++ b/server/schema/help.yaml
@@ -1539,6 +1539,14 @@
                       default: "2023-12-01"
                       required: true
                       help: A help message 
+                    - type: datetime
+                      dateType: datetime
+                      name: mydateandtime
+                      line: Demo1
+                      label: I will default to now
+                      evalDefault: true
+                      default: "new Date().toISOString().substring(0,19).replace('T',' ')"
+                      required: true                      
                     - type: datetime
                       dateType: datetime
                       name: mydateandtime
@@ -1955,11 +1963,22 @@
             description: |
               The type of the value depends on the field type.  
               Can be `string`,`boolean`, `number`, `array` or `object`.
-              When using `multiple`, the default is an `array`.  
+              When using `multiple`, the default must be an `array`.  
               When using an `enum` field, you can use the following special values :
               * `__auto__` : select the first
               * `__none__` : select none
               * `__all__` : select all (if multiple is true)
+            changelog:
+              - version: 4.0.5
+                type: added
+                description: A default can now hold placeholders like `$(other_field)`, and together with `evalDefault` be evaluated as javascript.           
+            with_types: text, textarea, number, expression, password, enum, radio, checkbox, datetime
+          - name: evalDefault
+            type: boolean
+            default: false
+            short: Evaluates default value
+            description: A default can be treated as javascript and can thus hold expressions like `'$(other_field)'.toUpperCase()` or `Math.PI` or `Date.getDate.toISOString()`
+            version: 4.0.5
             with_types: text, textarea, number, expression, password, enum, radio, checkbox, datetime
           - name: required
             type: boolean
@@ -2529,6 +2548,14 @@
             description: |
               With a tablefield, some fields might need to be readonly, like an `id` field for example.  
               Use this property to set the readonly fields.
+          - name: insertColumns
+            type: array
+            with_types: table
+            short: The insert columns in table
+            version: 4.0.5
+            description: |
+              With a tablefield, you can choose which fields are visible during insert.  This way you can choose to hide certain fields.
+              Use this property to set the insert fields.              
           - name: tableFields
             type: array
             with_types: table
diff --git a/server/src/init/index.js b/server/src/init/index.js
index de388d24..521b7339 100644
--- a/server/src/init/index.js
+++ b/server/src/init/index.js
@@ -1,9 +1,17 @@
 const logger=require("../lib/logger");
 var Ssh = require('../models/ssh.model');
 var Form = require('../models/form.model');
+var Job = require('../models/job.model')
 
 Ssh.generate(false)
   .catch((err)=>{
     logger.error("Failed to generate ssh keys : " + err)
   })
 Form.initBackupFolder()
+Job.abandon()
+  .then((changed)=>{
+    logger.warning(`Abandoned ${changed} jobs`)
+  })
+  .catch((err)=>{
+    logger.error("Failed to abandon job : " + err)
+  })
diff --git a/server/src/models/job.model.js b/server/src/models/job.model.js
index 82055d50..38b23092 100644
--- a/server/src/models/job.model.js
+++ b/server/src/models/job.model.js
@@ -170,6 +170,12 @@ Job.create = function (record) {
   return mysql.do("INSERT INTO AnsibleForms.`jobs` set ?", record)
     .then((res)=>{ return res.insertId})
 };
+Job.abandon = function () {
+  // abandon jobs
+  logger.notice(`Abandoning jobs`)
+  return mysql.do("UPDATE AnsibleForms.`jobs` set status='abandoned' where status='running' or status='abort'")
+    .then((res)=>{ return res.changedRows})
+};
 Job.update = function (record,id) {
   logger.notice(`Updating job ${id} ${record.status}`)
   return mysql.do("UPDATE AnsibleForms.`jobs` set ? WHERE id=?", [record,id])
@@ -1205,7 +1211,7 @@ Awx.launchTemplate = async function (template,ev,inventory,tags,limit,c,d,v,cred
   })
 
 };
-Awx.trackJob = function (job,jobid,counter,previousoutput,previousoutput2=undefined,lastrun=false) {
+Awx.trackJob = function (job,jobid,counter,previousoutput,previousoutput2=undefined,lastrun=false,retryCount=0) {
   return Awx.getConfig()
   .catch((err)=>{
     logger.error(err)
@@ -1292,16 +1298,35 @@ Awx.trackJob = function (job,jobid,counter,previousoutput,previousoutput2=undefi
             })
             .catch((err)=>{
               message = err.toString()
-              return Promise.resolve(message)
+              logger.error(message)
+              retryCount++
+              if(retryCount==10){
+                return Promise.resolve(message)
+              }else{
+                logger.warning(`Retrying jobid ${jobid} [${retryCount}]`)
+                return delay(1000).then(()=>{
+                  return Awx.trackJob(job,jobid,counter,previousoutput,previousoutput2,lastrun,retryCount)
+                })
+              }
             })
           }else{
             message=`could not find job with id ${job.id}`
-            return Promise.resolve(message)
+            logger.error(message)
+            retryCount++
+            if(retryCount==10){
+              return Promise.resolve(message)
+            }else{
+              logger.warning(`Retrying jobid ${jobid} [${retryCount}]`)
+              return delay(1000).then(()=>{
+                return Awx.trackJob(job,jobid,counter,previousoutput,previousoutput2,lastrun,retryCount)
+              })
+            }
           }
         })
         .catch(function (error) {
-          logger.error(error.message)
-          return Promise.resolve(error.message)
+          message=error.message
+          logger.error(message)
+          return Promise.resolve(message)
         })
 
   })
diff --git a/server/src/swagger.json b/server/src/swagger.json
index 46f706a9..738377bd 100644
--- a/server/src/swagger.json
+++ b/server/src/swagger.json
@@ -2,7 +2,7 @@
   "swagger": "2.0",
   "info": {
     "description": "This is the swagger interface for AnsibleForms.\r\nUse the `/auth/login` api with basic authentication to obtain a JWT token.\r\nThen use the access token, prefixed with the word '**Bearer**' to use all other api's.\r\nNote that the access token is limited in time.  You can then either login again and get a new set of tokens or use the `/token` api and the refresh token to obtain a new set (preferred).",
-    "version": "4.0.5",
+    "version": "4.0.7",
     "title": "AnsibleForms",
     "contact": {
       "email": "info@ansibleforms.com"