diff --git a/src/opnsense/mvc/app/models/OPNsense/Unbound/Unbound.xml b/src/opnsense/mvc/app/models/OPNsense/Unbound/Unbound.xml
index 023234a81..a7d6e8603 100644
--- a/src/opnsense/mvc/app/models/OPNsense/Unbound/Unbound.xml
+++ b/src/opnsense/mvc/app/models/OPNsense/Unbound/Unbound.xml
@@ -12,51 +12,30 @@
                 <default>53</default>
                 <Required>Y</Required>
             </port>
-            <stats type="BooleanField">
-                <default>0</default>
-                <Required>N</Required>
-            </stats>
+            <stats type="BooleanField"/>
             <active_interface type=".\UnboundInterfaceField">
                 <Required>N</Required>
                 <Multiple>Y</Multiple>
             </active_interface>
-            <dnssec type="BooleanField">
-                <default>0</default>
-            </dnssec>
-            <dns64 type="BooleanField">
-                <default>0</default>
-            </dns64>
+            <dnssec type="BooleanField"/>
+            <dns64 type="BooleanField"/>
             <dns64prefix type="NetworkField">
                 <Required>N</Required>
                 <NetMaskRequired>Y</NetMaskRequired>
                 <AddressFamily>ipv6</AddressFamily>
             </dns64prefix>
-            <noarecords type="BooleanField">
-                <default>0</default>
-            </noarecords>
-            <regdhcp type="BooleanField">
-                <default>0</default>
-            </regdhcp>
+            <noarecords type="BooleanField"/>
+            <regdhcp type="BooleanField"/>
             <regdhcpdomain type="TextField">
                 <Required>N</Required>
                 <mask>/^(?:(?:[a-z0-9]|[a-z0-9][a-z0-9\-]*[a-z0-9])\.)*(?:[a-z0-9]|[a-z0-9][a-z0-9\-]*[a-z0-9])$/i</mask>
                 <ValidationMessage>A valid domain must be specified.</ValidationMessage>
             </regdhcpdomain>
-            <regdhcpstatic type="BooleanField">
-                <default>0</default>
-            </regdhcpstatic>
-            <noreglladdr6 type="BooleanField">
-                <default>0</default>
-            </noreglladdr6>
-            <noregrecords type="BooleanField">
-                <default>0</default>
-            </noregrecords>
-            <txtsupport type="BooleanField">
-                <default>0</default>
-            </txtsupport>
-            <cacheflush type="BooleanField">
-                <default>0</default>
-            </cacheflush>
+            <regdhcpstatic type="BooleanField"/>
+            <noreglladdr6 type="BooleanField"/>
+            <noregrecords type="BooleanField"/>
+            <txtsupport type="BooleanField"/>
+            <cacheflush type="BooleanField"/>
             <local_zone_type type="OptionField">
                 <default>transparent</default>
                 <Required>Y</Required>
@@ -78,59 +57,26 @@
                 <Required>N</Required>
                 <Multiple>Y</Multiple>
             </outgoing_interface>
-            <enable_wpad type="BooleanField">
-                <default>0</default>
-            </enable_wpad>
+            <enable_wpad type="BooleanField"/>
         </general>
         <advanced>
-            <hideidentity type="BooleanField">
-                <default>0</default>
-            </hideidentity>
-            <hideversion type="BooleanField">
-                <default>0</default>
-            </hideversion>
-            <prefetch type="BooleanField">
-                <default>0</default>
-            </prefetch>
-            <prefetchkey type="BooleanField">
-                <default>0</default>
-            </prefetchkey>
-            <dnssecstripped type="BooleanField">
-                <default>0</default>
-            </dnssecstripped>
-            <serveexpired type="BooleanField">
-                <default>0</default>
-            </serveexpired>
-            <serveexpiredreplyttl type="NumericField">
-            </serveexpiredreplyttl>
-            <serveexpiredttl type="NumericField">
-            </serveexpiredttl>
-            <serveexpiredttlreset type="BooleanField">
-                <default>0</default>
-            </serveexpiredttlreset>
-            <serveexpiredclienttimeout type="NumericField">
-            </serveexpiredclienttimeout>
-            <qnameminstrict type="BooleanField">
-                <default>0</default>
-            </qnameminstrict>
-            <extendedstatistics type="BooleanField">
-                <default>0</default>
-            </extendedstatistics>
-            <logqueries type="BooleanField">
-                <default>0</default>
-            </logqueries>
-            <logreplies type="BooleanField">
-                <default>0</default>
-            </logreplies>
-            <logtagqueryreply type="BooleanField">
-                <default>0</default>
-            </logtagqueryreply>
-            <logservfail type="BooleanField">
-                <default>0</default>
-            </logservfail>
-            <loglocalactions type="BooleanField">
-                <default>0</default>
-            </loglocalactions>
+            <hideidentity type="BooleanField"/>
+            <hideversion type="BooleanField"/>
+            <prefetch type="BooleanField"/>
+            <prefetchkey type="BooleanField"/>
+            <dnssecstripped type="BooleanField"/>
+            <serveexpired type="BooleanField"/>
+            <serveexpiredreplyttl type="NumericField"/>
+            <serveexpiredttl type="NumericField"/>
+            <serveexpiredttlreset type="BooleanField"/>
+            <serveexpiredclienttimeout type="NumericField"/>
+            <qnameminstrict type="BooleanField"/>
+            <extendedstatistics type="BooleanField"/>
+            <logqueries type="BooleanField"/>
+            <logreplies type="BooleanField"/>
+            <logtagqueryreply type="BooleanField"/>
+            <logservfail type="BooleanField"/>
+            <loglocalactions type="BooleanField"/>
             <logverbosity type="OptionField">
                 <default>1</default>
                 <Required>Y</Required>
@@ -162,9 +108,7 @@
                 <default>0.0.0.0/8,10.0.0.0/8,100.64.0.0/10,169.254.0.0/16,172.16.0.0/12,192.0.2.0/24,192.168.0.0/16,198.18.0.0/15,198.51.100.0/24,203.0.113.0/24,233.252.0.0/24,::1/128,2001:db8::/32,fc00::/8,fd00::/8,fe80::/10</default>
                 <asList>Y</asList>
             </privateaddress>
-            <insecuredomain type="CSVListField">
-                <Required>N</Required>
-            </insecuredomain>
+            <insecuredomain type="CSVListField"/>
             <msgcachesize type="TextField">
                 <Mask>/[0-9]+[kmg]?/i</Mask>
                 <ValidationMessage>The cache size should be numeric, optionally appended with 'k', 'm', or 'g'</ValidationMessage>
@@ -173,31 +117,18 @@
                 <Mask>/[0-9]+[kmg]?/i</Mask>
                 <ValidationMessage>The cache size should be numeric, optionally appended with 'k', 'm', or 'g'</ValidationMessage>
             </rrsetcachesize>
-            <outgoingnumtcp type="NumericField">
-            </outgoingnumtcp>
-            <incomingnumtcp type="NumericField">
-            </incomingnumtcp>
-            <numqueriesperthread type="NumericField">
-            </numqueriesperthread>
-            <outgoingrange type="NumericField">
-            </outgoingrange>
-            <jostletimeout type="NumericField">
-            </jostletimeout>
-            <cachemaxttl type="NumericField">
-            </cachemaxttl>
-            <cachemaxnegativettl type="NumericField">
-            </cachemaxnegativettl>
-            <cacheminttl type="NumericField">
-            </cacheminttl>
-            <infrahostttl type="NumericField">
-            </infrahostttl>
-            <infrakeepprobing type="BooleanField">
-                <default>0</default>
-            </infrakeepprobing>
-            <infracachenumhosts type="NumericField">
-            </infracachenumhosts>
-            <unwantedreplythreshold type="NumericField">
-            </unwantedreplythreshold>
+            <outgoingnumtcp type="NumericField"/>
+            <incomingnumtcp type="NumericField"/>
+            <numqueriesperthread type="NumericField"/>
+            <outgoingrange type="NumericField"/>
+            <jostletimeout type="NumericField"/>
+            <cachemaxttl type="NumericField"/>
+            <cachemaxnegativettl type="NumericField"/>
+            <cacheminttl type="NumericField"/>
+            <infrahostttl type="NumericField"/>
+            <infrakeepprobing type="BooleanField"/>
+            <infracachenumhosts type="NumericField"/>
+            <unwantedreplythreshold type="NumericField"/>
         </advanced>
         <acls>
             <default_action type="OptionField">
@@ -251,10 +182,7 @@
                 <default>0</default>
                 <Required>Y</Required>
             </enabled>
-            <safesearch type="BooleanField">
-                <default>0</default>
-                <Required>N</Required>
-            </safesearch>
+            <safesearch type="BooleanField"/>
             <type type="OptionField">
                 <Required>N</Required>
                 <Multiple>Y</Multiple>
@@ -314,16 +242,10 @@
                 <NetMaskAllowed>N</NetMaskAllowed>
                 <AddressFamily>ipv4</AddressFamily>
             </address>
-            <nxdomain type="BooleanField">
-                <Required>N</Required>
-                <default>0</default>
-            </nxdomain>
+            <nxdomain type="BooleanField"/>
         </dnsbl>
         <forwarding>
-            <enabled type="BooleanField">
-                <default>0</default>
-                <Required>N</Required>
-            </enabled>
+            <enabled type="BooleanField"/>
         </forwarding>
         <dots>
             <dot type="ArrayField">