diff --git a/src/opnsense/www/js/opnsense.js b/src/opnsense/www/js/opnsense.js
index 2493c338a..842e1e1f3 100644
--- a/src/opnsense/www/js/opnsense.js
+++ b/src/opnsense/www/js/opnsense.js
@@ -44,13 +44,13 @@ function htmlDecode(value) {
  /**
  *
  * Map input fields from given parent tag to structure of named arrays.
+ * When a type_formatter attribute exists on the input element, this will be called with the val() content first
  *
  * @param parent tag id in dom
  * @return array
  */
 function getFormData(parent) {
-
-    var data = {};
+    let data = {};
     $("#"+parent+" input,#"+parent+" select,#"+parent+" textarea" ).each(function() {
         if ($(this).prop('id') === undefined || $(this).prop('id') === "") {
             // we need an id.
@@ -96,8 +96,13 @@ function getFormData(parent) {
                     // deserialize the field content - used for JS maintained fields
                     node[keypart] = sourceNode.data('data');
                 } else {
-                    // regular input type
-                    node[keypart] = sourceNode.val();
+                    // regular input type, might need a parser to convert to the correct format
+                    // (attribute type_formatter as function name)
+                    if (sourceNode.attr('type_formatter') !== undefined && window[sourceNode.attr('type_formatter')] !== undefined) {
+                        node[keypart] = window[sourceNode.attr('type_formatter')](sourceNode.val());
+                    } else {
+                        node[keypart] = sourceNode.val();
+                    }
                 }
             }
         });
@@ -142,13 +147,27 @@ function setFormData(parent,data) {
                             targetNode.tokenize2().trigger('tokenize:clear');
                         }
                         targetNode.empty(); // flush
-                        $.each(node[keypart],function(indxItem, keyItem){
-                            var opt = $("<option>").val(htmlDecode(indxItem)).text(keyItem["value"]);
-                            if (keyItem["selected"] != "0") {
-                                opt.attr('selected', 'selected');
+                        if (Array.isArray(node[keypart]) && node[keypart][0] !== undefined && node[keypart][0].key !== undefined) {
+                            // key value (sorted) list
+                            // (eg node[keypart][0] = {selected: 0, value: 'my item', key: 'item'})
+                            for (i=0; i < node[keypart].length; ++i) {
+                                let opt = $("<option>").val(htmlDecode(node[keypart][i].key)).text(node[keypart][i].value);
+                                if (String(node[keypart][i].selected) !== "0") {
+                                    opt.attr('selected', 'selected');
+                                }
+                                targetNode.append(opt);
                             }
-                            targetNode.append(opt);
-                        });
+                        } else{
+                            // default "dictionary" type select items
+                            // (eg node[keypart]['item'] = {selected: 0, value: 'my item'})
+                            $.each(node[keypart],function(indxItem, keyItem){
+                                let opt = $("<option>").val(htmlDecode(indxItem)).text(keyItem["value"]);
+                                if (String(keyItem["selected"]) !== "0") {
+                                    opt.attr('selected', 'selected');
+                                }
+                                targetNode.append(opt);
+                            });
+                        }
                     } else if (targetNode.prop("type") === "checkbox") {
                         // checkbox type
                         targetNode.prop("checked", node[keypart] != 0);
diff --git a/src/opnsense/www/js/opnsense_bootgrid_plugin.js b/src/opnsense/www/js/opnsense_bootgrid_plugin.js
index 4581be63e..ac2f80878 100644
--- a/src/opnsense/www/js/opnsense_bootgrid_plugin.js
+++ b/src/opnsense/www/js/opnsense_bootgrid_plugin.js
@@ -317,7 +317,7 @@ $.fn.UIBootgrid = function (params) {
         event.stopPropagation();
         let editDlg = this_grid.attr('data-editDialog');
         if (editDlg !== undefined) {
-            let uuid = $(this).data("row-id");
+            let uuid = $(this).data("row-id") !== undefined ? $(this).data("row-id") : '';
             let saveDlg = $("#btn_"+editDlg+"_save").unbind('click');
             this_grid.show_edit_dialog(event, params['get'] + uuid).done(function(){
                 saveDlg.unbind('click').click(function(){