diff --git a/ObsoleteFiles b/ObsoleteFiles
index 16678de6e..a80bba2ad 100644
--- a/ObsoleteFiles
+++ b/ObsoleteFiles
@@ -70,4 +70,6 @@ etc/defaults/vm-freebsd-OPNsense-15.7-RELEASE-amd64.conf
 etc/defaults/vm-freebsd-kFreeBSD-amd64-7.8.0.conf
 etc/defaults/vm-linux-opensuse-x86-13.1.conf
 etc/defaults/vm-linux-opennode-2.6.32-358.el6.x86_64.conf
+share/forms_version.schema
+tools/ddns
 "
diff --git a/imghelper.subr b/imghelper.subr
index 03091e294..036cad929 100644
--- a/imghelper.subr
+++ b/imghelper.subr
@@ -67,14 +67,25 @@ update_params()
 
 }
 
-
+# $formfile and $table must be present
 load_forms()
 {
-	local param _id def def2 link type _env
+	local param _id def def2 link type _env idx lnk
 
 	[ ! -f ${formfile} ] && err 1 "${MAGENTA}formfile not found: ${GREEN}${formfile}${NORMAL}"
+	[ -z "${table}" ] && table="forms"
+
+	idx=0
+
+	param="$( cbsdsql ${formfile} SELECT param FROM ${table}|/usr/bin/xargs )"
 
-	param=$( cbsdsql ${formfile} SELECT param FROM forms ORDER BY order_id |/usr/bin/xargs )
+#	eval $( cbsdsql ${formfile} SELECT param,mytable FROM ${table} WHERE type != \"subtable\" ORDER BY order_id |while read _x; do
+#		idx=$(( idx + 1 ))
+#		unset _param _mytable
+#		sqllist "${_x}" _param _mytable
+#		echo "param${idx}=\"${_param}\""
+#		echo "table${idx}=\"${_mytable}\""
+#	done )
 
 	helpername=$( cbsdsql ${formfile} SELECT helpername FROM system )
 	packages=$( cbsdsql ${formfile} SELECT packages FROM system )
@@ -84,44 +95,58 @@ load_forms()
 
 	[ "${packages}" = "0" ] && packages=""
 
-	_id=1
+	_id=0 # First SQL sequence is 1
 
 	eval $( for i in ${param}; do
 		unset _env desc _res cur attr xattr mandatory
 
-#		desc="$( cbsdsql ${formfile} SELECT desc FROM forms WHERE param=\"${i}\" |/usr/bin/tr -d "'\"")"
-		desc="$( cbsdsql ${formfile} SELECT desc FROM forms WHERE idx=\"${_id}\" |/usr/bin/tr -d "'\"")"
+		_id=$(( _id + 1 ))
+		desc="$( cbsdsql ${formfile} SELECT desc FROM ${table} WHERE idx=\"${_id}\" |/usr/bin/tr -d "'\"")"
 
 		is_delimer=0
+		is_hiddendelim=0
+		is_subtable=0
+		is_value=0
+
+		unset type
+		type="$( cbsdsql ${formfile} SELECT type FROM ${table} WHERE idx=\"${_id}\" )"
+
+		# check for special type or its value
+		case "${type}" in
+			hiddendelim)
+				is_hiddendelim=1
+				;;
+			subtable)
+				is_subtable=1
+				;;
+			delimer)
+				is_delimer=1
+				i="forms_delimer_${_id}"
+				;;
+			*)
+				is_value=1
+				;;
+		esac
 
 		# check for H_environment
-		if [ "${i}" != "-" ]; then
-			eval _res="\$H_${i}"
-		else
-			# just get unique name for delimer_field
-			i="forms_delimer_${_id}"
-			is_delimer=1
-		fi
+		[ ${is_value} -eq 1 ] && eval _res="\$H_${i}"
 
 		if [ -n "${_res}" ]; then
 			# environment is preferred
 			echo "${i}=\"${_res}\""
-		elif [ ${is_delimer} -eq 0 ]; then
-
-			unset type
-			type="$( cbsdsql ${formfile} SELECT type FROM forms WHERE param=\"${i}\" )"
-
+		elif [ ${is_value} -eq 1 ]; then
 			# preferred for cur value
-			cur="$( cbsdsql ${formfile} SELECT cur FROM forms WHERE param=\"${i}\" )"
+			cur="$( cbsdsql ${formfile} SELECT cur FROM ${table} WHERE idx=\"${_id}\" )"
 
 			if [ -n "${cur}" ]; then
 				def="${cur}"
 			else
-				def="$( cbsdsql ${formfile} SELECT def FROM forms WHERE param=\"${i}\" )"
+				def="$( cbsdsql ${formfile} SELECT def FROM ${table} WHERE idx=\"${_id}\" )"
 			fi
 
 			unset link
-			link="$( cbsdsql ${formfile} SELECT link FROM forms WHERE param=\"${i}\" )"
+			link="$( cbsdsql ${formfile} SELECT link FROM ${table} WHERE idx=\"${_id}\" )"
+
 			if [ -n "${link}" ]; then
 				def2="$( cbsdsql ${formfile} SELECT text FROM ${link} WHERE id=\"${def}\" )"
 				if [ -n "${def2}" ]; then
@@ -134,32 +159,32 @@ load_forms()
 			echo "${i}=\"${i}\""
 		fi
 
-		attr="$( cbsdsql ${formfile} SELECT attr FROM forms WHERE param=\"${i}\" )"
-		xattr="$( cbsdsql ${formfile} SELECT xattr FROM forms WHERE param=\"${i}\" )"
-		mandatory="$( cbsdsql ${formfile} SELECT mandatory FROM forms WHERE param=\"${i}\" )"
+		attr="$( cbsdsql ${formfile} SELECT attr FROM ${table} WHERE idx=\"${_id}\" )"
+		xattr="$( cbsdsql ${formfile} SELECT xattr FROM ${table} WHERE idx=\"${_id}\" )"
+		mandatory="$( cbsdsql ${formfile} SELECT mandatory FROM ${table} WHERE idx=\"${_id}\" )"
 
 		echo "${i}_desc=\"${desc}\""
 		echo "${i}_mandatory=\"${mandatory}\""
 		echo "${i}_link=\"${link}\""
 		echo "${i}_type=\"${type}\""
-
-		_id=$(( _id +1 ))
+		echo "${i}_attr=\"${attr}\""
 	done )
 }
 
-
+# $formfile and $table must be present
 load_new()
 {
 	[ ! -f ${formfile} ] && err 1 "${MAGENTA}formfile not found: ${GREEN}${formfile}${NORMAL}"
+	[ -z "${table}" ] && table="forms"
 
 	local param
-	param=$( cbsdsql ${formfile} SELECT param FROM forms ORDER BY order_id |/usr/bin/xargs )
+	param=$( cbsdsql ${formfile} SELECT param FROM ${table} ORDER BY order_id |/usr/bin/xargs )
 	local _env
 
 	eval $( for i in ${param}; do
 		[ "${i}" = "-" ] && continue
 		unset _env new
-		new="$( cbsdsql ${formfile} SELECT new FROM forms WHERE param=\"${i}\" )"
+		new="$( cbsdsql ${formfile} SELECT new FROM ${table} WHERE param=\"${i}\" )"
 		[ -z "${new}" ] && continue
 		echo "${i}=\"${new}\""
 	done )
diff --git a/jailctl/jcleanup b/jailctl/jcleanup
index 4e2da6653..b8295ab8c 100755
--- a/jailctl/jcleanup
+++ b/jailctl/jcleanup
@@ -3,7 +3,7 @@
 globalconf="${workdir}/cbsd.conf";
 CBSDMODULE="jail"
 MYARG="jname"
-MYOPTARG=""
+MYOPTARG="sharedfs"
 MYDESC="Force unmount and cleanup for offline jail"
 
 # Cleanup all items of broken jail
@@ -12,11 +12,19 @@ MYDESC="Force unmount and cleanup for offline jail"
 . ${mdtools}
 . ${strings}
 
+sharedfs=0
+
 init $*
 
 . ${jrcconf}
 [ $? -eq 1 ] && return 0 #only for registered jails
 
+# remove zombie jail
+if [ "${jid}" != "0" ]; then
+	/usr/sbin/jail -r ${jid}
+	 ${miscdir}/sqlcli ${dbdir}/local.sqlite "UPDATE jails SET jid=\"0\" WHERE jname=\"${jname}\""
+fi
+
 [ "${mdsize}" != "0" ] && MDFILE=$( eval find_md_by_mountpath ${data} )
 [ ${baserw} -eq 1 ] && path=$data
 
@@ -37,3 +45,9 @@ fi
 
 umount_cdirs ${path} ${rootflags}
 [ "${mdsize}" != "0" -a -n "${MDFILE}" ] && unmountmd md=${MDFILE}
+
+jaillock="${jailsysdir}/${jname}/locked"
+if [ ${sharedfs} -eq 0 ]; then
+	[ -f "${jaillock}" ] && /bin/rm -f ${jaillock}
+fi
+
diff --git a/jailctl/jls b/jailctl/jls
index 7418d7da1..21aa81fe1 100755
--- a/jailctl/jls
+++ b/jailctl/jls
@@ -64,7 +64,7 @@ show_jaildata_from_sql()
 		sqlfile="local"
 	fi
 
-	cbsdsql ${sqlfile} SELECT jname FROM jails| while read jname; do
+	cbsdsql ${sqlfile} SELECT jname FROM jails WHERE emulator=\"jail\" | while read jname; do
 		_status=""
 		. ${jrcconf}
 
diff --git a/misc/updatesql b/misc/updatesql
index 0b831d43f..3acecc71b 100755
--- a/misc/updatesql
+++ b/misc/updatesql
@@ -1,7 +1,7 @@
 #!/usr/local/bin/cbsd
-#v10.1.2
+#v10.3.0
 # Script for create or upgrade SQLite tables by known scheme from sh file
-# Usage: ./updatesql <dbfile> <schema_file>
+# Usage: ./updatesql <dbfile> <schema_file> <tablename>
 
 create_table()
 {
@@ -36,13 +36,14 @@ update_table()
 }
 
 ## MAIN ##
-if [ $# -ne 2 ]; then
-	echo "Usage $0 <dbfile> <path_to_schema>"
+if [ $# -ne 3 ]; then
+	echo "Usage $0 <dbfile> <path_to_schema> <tablename>"
 	exit 0
 fi
 
 MYFILE=${1}
 SCHEMA=${2}
+MYTABLE=${3}
 
 [ ! -f ${MYFILE} ] && /usr/bin/touch ${MYFILE}
 /bin/chmod 0660 ${MYFILE} && /usr/sbin/chown ${cbsduser}:${cbsduser} ${MYFILE}
@@ -54,5 +55,10 @@ fi
 
 . ${SCHEMA}
 
+if [ -z "${MYTABLE}" ]; then
+	echo "No MYTABLE variable"
+	exit 1
+fi
+
 create_table
 update_table
diff --git a/securecmd b/securecmd
index d650f21d2..527aa7d29 100644
--- a/securecmd
+++ b/securecmd
@@ -23,8 +23,6 @@ bstop \
 buildkernel \
 buildworld \
 carpcfg \
-cpr \
-ddns \
 delete-old-libs \
 geli \
 getnics-by-ip \
diff --git a/share/cbsdtaskd-taskd.schema b/share/cbsdtaskd-taskd.schema
index 389ee1fad..b9511243c 100644
--- a/share/cbsdtaskd-taskd.schema
+++ b/share/cbsdtaskd-taskd.schema
@@ -1,5 +1,5 @@
 # Default SQL scheme for cbsd taskd
-MYTABLE="taskd"
+#MYTABLE="taskd"
 MYCOL="id st_time end_time user cmd status errcode owner logfile logtype notify autoflush after client_id"
 
 # Possible time:
diff --git a/share/forms.schema b/share/forms.schema
index d2fee2787..1ee60ba9d 100644
--- a/share/forms.schema
+++ b/share/forms.schema
@@ -1,8 +1,9 @@
 # Default SQL scheme for DB img::temp
-MYTABLE="forms"
-MYCOL="idx group_id order_id param desc def cur new mandatory attr xattr type link"
+#MYTABLE="forms"
+MYCOL="idx mytable group_id order_id param desc def cur new mandatory attr xattr type link"
 
 idx="INTEGER PRIMARY KEY AUTOINCREMENT"
+mytable="VARCHAR(255) DEFAULT ''"  # identification myself for VIEW output
 group_id="INTEGER DEFAULT 1"
 order_id="INTEGER DEFAULT 1"
 param="TEXT DEFAULT NULL"
diff --git a/share/forms_version.schema b/share/forms_system.schema
similarity index 93%
rename from share/forms_version.schema
rename to share/forms_system.schema
index b9abae614..613ea38fc 100644
--- a/share/forms_version.schema
+++ b/share/forms_system.schema
@@ -1,5 +1,5 @@
 # Default SQL scheme for DB img::system
-MYTABLE="system"
+#MYTABLE="system"
 MYCOL="helpername helperdesc version packages have_restart"
 
 helpername="INTEGER DEFAULT 0"
diff --git a/share/forms_yesno.schema b/share/forms_yesno.schema
new file mode 100644
index 000000000..c924065f8
--- /dev/null
+++ b/share/forms_yesno.schema
@@ -0,0 +1,10 @@
+# Default SQL scheme for DB img::system
+#MYTABLE="system"
+MYCOL="id text order_id"
+
+id="INTEGER PRIMARY KEY AUTOINCREMENT"
+text="TEXT DEFAULT NULL"
+order_id="INTEGER DEFAULT 0"
+
+INITDB=""
+CONSTRAINT=""
diff --git a/share/local-bhyve.schema b/share/local-bhyve.schema
index 609d514a6..e983cf2e1 100644
--- a/share/local-bhyve.schema
+++ b/share/local-bhyve.schema
@@ -1,7 +1,7 @@
 . ${sharedir}/bhyve.conf
 
 # Default SQL scheme for DB local::bhyve
-MYTABLE="bhyve"
+#MYTABLE="bhyve"
 
 # MYCOL describe in bhyve.conf
 
diff --git a/share/local-bhyvedsk.schema b/share/local-bhyvedsk.schema
index 01d84ed1e..2a4699346 100644
--- a/share/local-bhyvedsk.schema
+++ b/share/local-bhyvedsk.schema
@@ -1,7 +1,7 @@
 . ${sharedir}/bhyvedsk.conf
 
 # Default SQL scheme for DB local::bhyvedsk
-MYTABLE="bhyvedsk"
+#MYTABLE="bhyvedsk"
 
 # MYCOL describe in bhyvedsk.conf
 
diff --git a/share/local-bhyvenic.schema b/share/local-bhyvenic.schema
index 71a0ee665..0e8ab0268 100644
--- a/share/local-bhyvenic.schema
+++ b/share/local-bhyvenic.schema
@@ -1,7 +1,7 @@
 . ${sharedir}/bhyvenic.conf
 
 # Default SQL scheme for DB local::bhyvenic
-MYTABLE="bhyvenic"
+#MYTABLE="bhyvenic"
 
 # MYCOL described in bhyvenic.conf
 
diff --git a/share/local-carp.schema b/share/local-carp.schema
index 9eeeccfb2..850bcf841 100644
--- a/share/local-carp.schema
+++ b/share/local-carp.schema
@@ -1,7 +1,7 @@
 . ${sharedir}/carp.conf
 
 # Default SQL scheme for DB local::bhyve
-MYTABLE="carp"
+#MYTABLE="carp"
 
 id="INTEGER PRIMARY KEY AUTOINCREMENT"
 vhid="integer default 1"
diff --git a/share/local-fwcounters.schema b/share/local-fwcounters.schema
index b49aaefe3..fd74e10ee 100644
--- a/share/local-fwcounters.schema
+++ b/share/local-fwcounters.schema
@@ -1,5 +1,5 @@
 # Default SQL scheme for fwcounter db
-MYTABLE="traffic"
+#MYTABLE="traffic"
 MYCOL="dt incoming outgoing"
 
 dt="TIMESTAMP DATE DEFAULT (datetime('now','localtime')) UNIQUE PRIMARY KEY"
diff --git a/share/local-gw.schema b/share/local-gw.schema
index a7d1c480c..87a94e293 100644
--- a/share/local-gw.schema
+++ b/share/local-gw.schema
@@ -1,5 +1,5 @@
 # Default SQL scheme for DB local::nics
-MYTABLE="gw"
+#MYTABLE="gw"
 MYCOL="gw val"
 
 gw="TEXT DEFAULT NULL UNIQUE PRIMARY KEY"
diff --git a/share/local-jails.schema b/share/local-jails.schema
index 280938a22..caf85a7c1 100644
--- a/share/local-jails.schema
+++ b/share/local-jails.schema
@@ -1,5 +1,5 @@
 # Default SQL scheme for DB local::jails
-MYTABLE="jails"
+#MYTABLE="jails"
 MYCOL="jname jid path host_hostname ip4_addr mount_devfs allow_mount allow_devfs allow_nullfs mount_fstab mkhostsfile devfs_ruleset interface \
 basename slavenode baserw mount_src mount_obj mount_kernel mount_ports astart data vnet applytpl mdsize rcconf floatresolv ver arch masterhost \
 exec_start exec_stop exec_poststart exec_poststop exec_prestart exec_prestop exec_master_poststart exec_master_poststop \
diff --git a/share/local-local.schema b/share/local-local.schema
index 1aa569298..c02386875 100644
--- a/share/local-local.schema
+++ b/share/local-local.schema
@@ -1,5 +1,5 @@
 # Default SQL scheme for DB local::local
-MYTABLE="local"
+#MYTABLE="local"
 MYCOL="nodename hostname nodeip nodedescr jnameserver nodeippool natip nat_enable fbsdrepo mdtmp repo workdir ipfw_enable \
 fs zfsfeat jail_interface ncpu physmem memtype disks cpumodel cpufreq kernhz sched eventtimer nics parallel stable osrelease hostarch \
 vimage_feature racct sqlreplica domain platform hammerfeat"
diff --git a/share/local-net.schema b/share/local-net.schema
index fb9c524c7..32481301a 100644
--- a/share/local-net.schema
+++ b/share/local-net.schema
@@ -1,5 +1,5 @@
 # Default SQL scheme for DB local::nics
-MYTABLE="net"
+#MYTABLE="net"
 MYCOL="nic mac type media ip4 ip6 mask4 mask6 status usr1 usr2 usr3"
 
 nic="TEXT DEFAULT NULL UNIQUE PRIMARY KEY"
diff --git a/share/local-rctl.schema b/share/local-rctl.schema
index 3b7c3b7ce..41d1b72dc 100644
--- a/share/local-rctl.schema
+++ b/share/local-rctl.schema
@@ -1,7 +1,7 @@
 . ${sharedir}/rctl.conf
 
 # Default SQL scheme for DB local::jrctl
-MYTABLE="rctl"
+#MYTABLE="rctl"
 
 # MYCOL describe in rctl.conf
 
diff --git a/share/local-unconfigured.schema b/share/local-unconfigured.schema
index 302dd45dc..6535bb994 100644
--- a/share/local-unconfigured.schema
+++ b/share/local-unconfigured.schema
@@ -1,5 +1,5 @@
 # Default SQL scheme for DB local::unconfigured
-MYTABLE="unconfigured"
+#MYTABLE="unconfigured"
 MYCOL="items"
 
 items="text default null"
diff --git a/share/local-virtualbox.schema b/share/local-virtualbox.schema
index ec543390d..a2c2c67a8 100644
--- a/share/local-virtualbox.schema
+++ b/share/local-virtualbox.schema
@@ -1,7 +1,7 @@
 . ${sharedir}/virtualbox.conf
 
 # Default SQL scheme for DB local::virtualbox
-MYTABLE="virtualbox"
+#MYTABLE="virtualbox"
 
 # MYCOL describe in virtualbox.conf
 
diff --git a/share/local-virtualboxdsk.schema b/share/local-virtualboxdsk.schema
index ac255dbdf..84dc797e4 100644
--- a/share/local-virtualboxdsk.schema
+++ b/share/local-virtualboxdsk.schema
@@ -1,7 +1,7 @@
 . ${sharedir}/virtualboxdsk.conf
 
 # Default SQL scheme for DB local::virtualboxdsk
-MYTABLE="virtualboxdsk"
+#MYTABLE="virtualboxdsk"
 
 # MYCOL describe in virtualboxdsk.conf
 
diff --git a/share/local-virtualboxnic.schema b/share/local-virtualboxnic.schema
index 5f3160868..603f52c4f 100644
--- a/share/local-virtualboxnic.schema
+++ b/share/local-virtualboxnic.schema
@@ -1,7 +1,7 @@
 . ${sharedir}/virtualboxnic.conf
 
 # Default SQL scheme for DB local::virtualboxnic
-MYTABLE="virtualboxnic"
+#MYTABLE="virtualboxnic"
 
 # MYCOL described in virtualboxnic.conf
 
diff --git a/share/local-vnetnic.schema b/share/local-vnetnic.schema
index ea2705dcd..94abda75a 100644
--- a/share/local-vnetnic.schema
+++ b/share/local-vnetnic.schema
@@ -1,7 +1,7 @@
 . ${sharedir}/vnetnic.conf
 
 # Default SQL scheme for DB local::vnetnic
-MYTABLE="vnetnic"
+#MYTABLE="vnetnic"
 
 # MYCOL described in vnetnic.conf
 jname="text default 0"
diff --git a/share/local-xen.schema b/share/local-xen.schema
index 73b37df47..301816f77 100644
--- a/share/local-xen.schema
+++ b/share/local-xen.schema
@@ -1,7 +1,7 @@
 . ${sharedir}/xen.conf
 
 # Default SQL scheme for DB local::xen
-MYTABLE="xen"
+#MYTABLE="xen"
 
 # MYCOL describe in xen.conf
 
diff --git a/share/local-xendsk.schema b/share/local-xendsk.schema
index 2bae79a34..d095f638a 100644
--- a/share/local-xendsk.schema
+++ b/share/local-xendsk.schema
@@ -1,7 +1,7 @@
 . ${sharedir}/xendsk.conf
 
 # Default SQL scheme for DB local::xendsk
-MYTABLE="xendsk"
+#MYTABLE="xendsk"
 
 # MYCOL describe in xendsk.conf
 
diff --git a/share/local-xennic.schema b/share/local-xennic.schema
index ec0d3ea8c..77bbf0a1b 100644
--- a/share/local-xennic.schema
+++ b/share/local-xennic.schema
@@ -1,7 +1,7 @@
 . ${sharedir}/xennic.conf
 
 # Default SQL scheme for DB local::xennic
-MYTABLE="xennic"
+#MYTABLE="xennic"
 
 # MYCOL described in xennic.conf
 
diff --git a/share/node-nodelist.schema b/share/node-nodelist.schema
index 4c936c674..cc7b13704 100644
--- a/share/node-nodelist.schema
+++ b/share/node-nodelist.schema
@@ -1,5 +1,5 @@
 # Default SQL scheme for DB nodes::nodelist
-MYTABLE="nodelist"
+#MYTABLE="nodelist"
 MYCOL="nodename ip port keyfile rootkeyfile status invfile idle"
 
 nodename="TEXT UNIQUE PRIMARY KEY"
diff --git a/share/webdev-jails.schema b/share/webdev-jails.schema
index 3c12692ee..63fc81bc1 100644
--- a/share/webdev-jails.schema
+++ b/share/webdev-jails.schema
@@ -1,5 +1,5 @@
 # Default SQL scheme for DB img::temp
-MYTABLE="jails"
+#MYTABLE="jails"
 MYCOL="id project_id name ip jprofile description size hostname modules_count status descr_mtime deleted"
 
 id="INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL"
diff --git a/share/webdev-jimages.schema b/share/webdev-jimages.schema
index af4ec5f81..fd009e87a 100644
--- a/share/webdev-jimages.schema
+++ b/share/webdev-jimages.schema
@@ -1,5 +1,5 @@
 # Default SQL scheme for DB img::temp
-MYTABLE="jimages"
+#MYTABLE="jimages"
 MYCOL="id file_name name description export_time size"
 
 id="INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT"
diff --git a/share/webdev-modules.schema b/share/webdev-modules.schema
index db3cb5ed2..75915840c 100644
--- a/share/webdev-modules.schema
+++ b/share/webdev-modules.schema
@@ -1,5 +1,5 @@
 # Default SQL scheme for DB img::temp
-MYTABLE="modules"
+#MYTABLE="modules"
 MYCOL="id pkg_groups_link_id project_id jail_id version size installed install_date deleted task_id"
 
 id="INTEGER  PRIMARY KEY AUTOINCREMENT NOT NULL"
diff --git a/share/webdev-modules_groups.schema b/share/webdev-modules_groups.schema
index 9748d2b31..74a2fba14 100644
--- a/share/webdev-modules_groups.schema
+++ b/share/webdev-modules_groups.schema
@@ -1,5 +1,5 @@
 # Default SQL scheme for DB img::temp
-MYTABLE="modules_groups"
+#MYTABLE="modules_groups"
 MYCOL="id name comment"
 
 id='INTEGER  PRIMARY KEY AUTOINCREMENT NOT NULL'
diff --git a/share/webdev-packages.schema b/share/webdev-packages.schema
index 6b3c6daad..d5ec88b27 100644
--- a/share/webdev-packages.schema
+++ b/share/webdev-packages.schema
@@ -1,5 +1,5 @@
 # Default SQL scheme for DB img::temp
-MYTABLE="packages"
+#MYTABLE="packages"
 MYCOL="id name packagename version comment flatsize helpername"
 
 id="INTEGER PRIMARY KEY AUTOINCREMENT"
diff --git a/share/webdev-pkg_groups_link.schema b/share/webdev-pkg_groups_link.schema
index 6cfe8b44c..cb86d94b7 100644
--- a/share/webdev-pkg_groups_link.schema
+++ b/share/webdev-pkg_groups_link.schema
@@ -1,5 +1,5 @@
 # Default SQL scheme for DB img::temp
-MYTABLE="pkg_groups_link"
+#MYTABLE="pkg_groups_link"
 MYCOL="id group_id packagename comment is_new"
 
 id="INTEGER  PRIMARY KEY AUTOINCREMENT NOT NULL"
diff --git a/share/webdev-projects.schema b/share/webdev-projects.schema
index 4b032fc65..c56c0c423 100644
--- a/share/webdev-projects.schema
+++ b/share/webdev-projects.schema
@@ -1,5 +1,5 @@
 # Default SQL scheme for DB img::temp
-MYTABLE="projects"
+#MYTABLE="projects"
 MYCOL="id name servers_count jails_count modules_count size"
 
 id='INTEGER  PRIMARY KEY AUTOINCREMENT NOT NULL'
diff --git a/share/zrepd.schema b/share/zrepd.schema
index d5893314e..7dd230da2 100644
--- a/share/zrepd.schema
+++ b/share/zrepd.schema
@@ -1,7 +1,7 @@
 . ${sharedir}/zrep.conf
 
 # Default SQL scheme for DB local::vnetnic
-MYTABLE="map"
+#MYTABLE="map"
 
 # MYCOL described in zrep.conf
 id="INTEGER PRIMARY KEY AUTOINCREMENT"
diff --git a/sudoexec/initenv b/sudoexec/initenv
index fab097203..c475c43a8 100755
--- a/sudoexec/initenv
+++ b/sudoexec/initenv
@@ -370,7 +370,8 @@ EOF
 	installne "-o ${cbsduser} -g ${cbsduser} -m 444" ${distdir}/share/jrctl-arg ${sharedir}/jrctl-arg
 	installne "-o ${cbsduser} -g ${cbsduser} -m 444" ${distdir}/share/local-carp.schema ${sharedir}/local-carp.schema
 	installne "-o ${cbsduser} -g ${cbsduser} -m 444" ${distdir}/share/forms.schema ${sharedir}/forms.schema
-	installne "-o ${cbsduser} -g ${cbsduser} -m 444" ${distdir}/share/forms_version.schema ${sharedir}/forms_version.schema
+	installne "-o ${cbsduser} -g ${cbsduser} -m 444" ${distdir}/share/forms_system.schema ${sharedir}/forms_system.schema
+	installne "-o ${cbsduser} -g ${cbsduser} -m 444" ${distdir}/share/forms_yesno.schema ${sharedir}/forms_yesno.schema
 	installne "-o ${cbsduser} -g ${cbsduser} -m 444" ${distdir}/share/local-fwcounters.schema ${sharedir}/local-fwcounters.schema
 	installne "-o ${cbsduser} -g ${cbsduser} -m 444" ${distdir}/share/local-gw.schema ${sharedir}/local-gw.schema
 	installne "-o ${cbsduser} -g ${cbsduser} -m 444" ${distdir}/share/local-jails.schema ${sharedir}/local-jails.schema
@@ -504,38 +505,38 @@ phase5()
 	[ -z "${nodename}" ] && err 1 "nodename must be not empty"
 
 	[ ! -f "${nodenamefile}" ] && echo "${nodename}" > "${nodenamefile}"
-	[ ! -f "${dbdir}/nodes.sqlite" ] && /usr/local/bin/cbsd ${miscdir}/updatesql ${dbdir}/nodes.sqlite ${distdir}/share/node-nodelist.schema
+	[ ! -f "${dbdir}/nodes.sqlite" ] && /usr/local/bin/cbsd ${miscdir}/updatesql ${dbdir}/nodes.sqlite ${distdir}/share/node-nodelist.schema nodelist
 
 	if [ ! -f "${dbdir}/inv.${nodename}.sqlite" ]; then
-		/usr/local/bin/cbsd ${miscdir}/updatesql ${dbdir}/inv.${nodename}.sqlite ${distdir}/share/local-unconfigured.schema
-		/usr/local/bin/cbsd ${miscdir}/updatesql ${dbdir}/inv.${nodename}.sqlite ${distdir}/share/local-local.schema
-		/usr/local/bin/cbsd ${miscdir}/updatesql ${dbdir}/inv.${nodename}.sqlite ${distdir}/share/local-jails.schema
+		/usr/local/bin/cbsd ${miscdir}/updatesql ${dbdir}/inv.${nodename}.sqlite ${distdir}/share/local-unconfigured.schema unconfigured
+		/usr/local/bin/cbsd ${miscdir}/updatesql ${dbdir}/inv.${nodename}.sqlite ${distdir}/share/local-local.schema local
+		/usr/local/bin/cbsd ${miscdir}/updatesql ${dbdir}/inv.${nodename}.sqlite ${distdir}/share/local-jails.schema jails
 		$ECHO "${MAGENTA}Empty inventory database created: ${GREEN}${dbdir}/inv.${nodename}.sqlite${NORMAL}"
 		${miscdir}/sqlcli ${dbdir}/inv.${nodename}.sqlite "insert into local ( nodename ) VALUES ( \"${nodename}\" )"
 	fi
 
 	/bin/chmod 0660 ${dbdir}/inv.${nodename}.sqlite && /usr/sbin/chown ${cbsduser}:${cbsduser} ${dbdir}/inv.${nodename}.sqlite
 
-	/usr/local/bin/cbsd ${miscdir}/updatesql ${dbdir}/inv.${nodename}.sqlite ${distdir}/share/local-local.schema
-	/usr/local/bin/cbsd ${miscdir}/updatesql ${dbdir}/inv.${nodename}.sqlite ${distdir}/share/local-carp.schema
-	/usr/local/bin/cbsd ${miscdir}/updatesql ${dbdir}/inv.${nodename}.sqlite ${distdir}/share/forms.schema
-	/usr/local/bin/cbsd ${miscdir}/updatesql ${dbdir}/inv.${nodename}.sqlite ${distdir}/share/forms_version.schema
-	/usr/local/bin/cbsd ${miscdir}/updatesql ${dbdir}/inv.${nodename}.sqlite ${distdir}/share/local-jails.schema
-	/usr/local/bin/cbsd ${miscdir}/updatesql ${dbdir}/inv.${nodename}.sqlite ${distdir}/share/local-rctl.schema
-	/usr/local/bin/cbsd ${miscdir}/updatesql ${dbdir}/inv.${nodename}.sqlite ${distdir}/share/local-bhyve.schema
-	/usr/local/bin/cbsd ${miscdir}/updatesql ${dbdir}/inv.${nodename}.sqlite ${distdir}/share/local-bhyvedsk.schema
-	/usr/local/bin/cbsd ${miscdir}/updatesql ${dbdir}/inv.${nodename}.sqlite ${distdir}/share/local-bhyvenic.schema
-	/usr/local/bin/cbsd ${miscdir}/updatesql ${dbdir}/inv.${nodename}.sqlite ${distdir}/share/local-virtualbox.schema
-	/usr/local/bin/cbsd ${miscdir}/updatesql ${dbdir}/inv.${nodename}.sqlite ${distdir}/share/local-virtualboxdsk.schema
-	/usr/local/bin/cbsd ${miscdir}/updatesql ${dbdir}/inv.${nodename}.sqlite ${distdir}/share/local-virtualboxnic.schema
-	/usr/local/bin/cbsd ${miscdir}/updatesql ${dbdir}/inv.${nodename}.sqlite ${distdir}/share/local-xen.schema
-	/usr/local/bin/cbsd ${miscdir}/updatesql ${dbdir}/inv.${nodename}.sqlite ${distdir}/share/local-xendsk.schema
-	/usr/local/bin/cbsd ${miscdir}/updatesql ${dbdir}/inv.${nodename}.sqlite ${distdir}/share/local-xennic.schema
-	/usr/local/bin/cbsd ${miscdir}/updatesql ${dbdir}/inv.${nodename}.sqlite ${distdir}/share/local-vnetnic.schema
-	/usr/local/bin/cbsd ${miscdir}/updatesql ${dbdir}/cbsdtaskd.sqlite ${distdir}/share/cbsdtaskd-taskd.schema
-	/usr/local/bin/cbsd ${miscdir}/updatesql ${dbdir}/zrepd.sqlite ${distdir}/share/zrepd.schema
-
-	[ -f "${dbdir}/nodes.sqlite" ] && /usr/local/bin/cbsd ${miscdir}/updatesql ${dbdir}/nodes.sqlite ${distdir}/share/node-nodelist.schema
+	/usr/local/bin/cbsd ${miscdir}/updatesql ${dbdir}/inv.${nodename}.sqlite ${distdir}/share/local-local.schema local
+	/usr/local/bin/cbsd ${miscdir}/updatesql ${dbdir}/inv.${nodename}.sqlite ${distdir}/share/local-carp.schema carp
+	/usr/local/bin/cbsd ${miscdir}/updatesql ${dbdir}/inv.${nodename}.sqlite ${distdir}/share/forms.schema forms
+	/usr/local/bin/cbsd ${miscdir}/updatesql ${dbdir}/inv.${nodename}.sqlite ${distdir}/share/forms_system.schema system
+	/usr/local/bin/cbsd ${miscdir}/updatesql ${dbdir}/inv.${nodename}.sqlite ${distdir}/share/local-jails.schema jails
+	/usr/local/bin/cbsd ${miscdir}/updatesql ${dbdir}/inv.${nodename}.sqlite ${distdir}/share/local-rctl.schema rctl
+	/usr/local/bin/cbsd ${miscdir}/updatesql ${dbdir}/inv.${nodename}.sqlite ${distdir}/share/local-bhyve.schema bhyve
+	/usr/local/bin/cbsd ${miscdir}/updatesql ${dbdir}/inv.${nodename}.sqlite ${distdir}/share/local-bhyvedsk.schema bhyvedsk
+	/usr/local/bin/cbsd ${miscdir}/updatesql ${dbdir}/inv.${nodename}.sqlite ${distdir}/share/local-bhyvenic.schema bhyvenic
+	/usr/local/bin/cbsd ${miscdir}/updatesql ${dbdir}/inv.${nodename}.sqlite ${distdir}/share/local-virtualbox.schema virtualbox
+	/usr/local/bin/cbsd ${miscdir}/updatesql ${dbdir}/inv.${nodename}.sqlite ${distdir}/share/local-virtualboxdsk.schema virtualboxdsk
+	/usr/local/bin/cbsd ${miscdir}/updatesql ${dbdir}/inv.${nodename}.sqlite ${distdir}/share/local-virtualboxnic.schema virtualboxnic
+	/usr/local/bin/cbsd ${miscdir}/updatesql ${dbdir}/inv.${nodename}.sqlite ${distdir}/share/local-xen.schema xen
+	/usr/local/bin/cbsd ${miscdir}/updatesql ${dbdir}/inv.${nodename}.sqlite ${distdir}/share/local-xendsk.schema xendsk
+	/usr/local/bin/cbsd ${miscdir}/updatesql ${dbdir}/inv.${nodename}.sqlite ${distdir}/share/local-xennic.schema xennic
+	/usr/local/bin/cbsd ${miscdir}/updatesql ${dbdir}/inv.${nodename}.sqlite ${distdir}/share/local-vnetnic.schema vnetnic
+	/usr/local/bin/cbsd ${miscdir}/updatesql ${dbdir}/cbsdtaskd.sqlite ${distdir}/share/cbsdtaskd-taskd.schema taskd
+	/usr/local/bin/cbsd ${miscdir}/updatesql ${dbdir}/zrepd.sqlite ${distdir}/share/zrepd.schema map
+
+	[ -f "${dbdir}/nodes.sqlite" ] && /usr/local/bin/cbsd ${miscdir}/updatesql ${dbdir}/nodes.sqlite ${distdir}/share/node-nodelist.schema nodelist
 
 	/bin/ln -sfh ${dbdir}/inv.${nodename}.sqlite ${dbdir}/local.sqlite
 
diff --git a/sudoexec/jremove b/sudoexec/jremove
index 6896c6832..6fe269bc3 100755
--- a/sudoexec/jremove
+++ b/sudoexec/jremove
@@ -2,7 +2,7 @@
 #v10.1.0
 globalconf="${workdir}/cbsd.conf";
 MYARG=""
-MYOPTARG="jname"
+MYOPTARG="jname inter"
 MYDESC="Destroy jail"
 CBSDMODULE="jail"
 EXTHELP="wf_jremove.html"
@@ -19,6 +19,8 @@ set +e
 [ -z "${1}" ] && select_jail_by_list -s "List of local jails:" -r 0
 init $*
 
+[ -n "${inter}" ] && shift
+
 if [ -n "$jname" ]; then
 	JLIST=$jname
 else
@@ -39,9 +41,15 @@ for jname in ${JLIST}; do
 
 	if [ $? -eq 1 ]; then
 		if [ ! -f "${JAILRCCONF}" ]; then
-			[ $sqlreplica -eq 0 ] && err 1 "${MAGENTA}No such jail: ${GREEN}${jname}${NORMAL}"
+			if [ $sqlreplica -eq 0 ]; then
+				${ECHO} "${MAGENTA}No such jail: ${GREEN}${jname}${NORMAL}"
+				continue
+			fi
 			remotenode=$( jwhereis $jname )
-			[ -z "${remotenode}" ] && err 1 "${MAGENTA}No such jail: ${GREEN}${jname}${NORMAL}"
+			if [ -z "${remotenode}" ]; then
+				${ECHO} "${MAGENTA}No such jail: ${GREEN}${jname}${NORMAL}"
+				continue
+			fi
 			for i in ${remotenode}; do
 				if [ "${i}" = "${nodename}" ]; then
 					${ECHO} "${MAGENTA}Remote jremove: found on nodename ${GREEN}${nodename}${MAGENTA}. Skipped${NORMAL}"
diff --git a/sudoexec/jstart b/sudoexec/jstart
index 4caf437a3..c7dd70383 100755
--- a/sudoexec/jstart
+++ b/sudoexec/jstart
@@ -546,7 +546,6 @@ trap "" HUP INT ABRT BUS TERM EXIT
 UNDHOSTNAME=$( echo ${hostname} |/usr/bin/tr  "." "_" )
 FID="/var/run/jail_${UNDHOSTNAME}.id"
 echo ${ST} > ${FID}
-[ -n "${ddns_zone_list}" ] && cbsd ddns mode=add jname=${jname}
 sync
 exec_cbsdjail_first_boot
 
diff --git a/sudoexec/jstop b/sudoexec/jstop
index c4f7e60dd..3b1769fb0 100755
--- a/sudoexec/jstop
+++ b/sudoexec/jstop
@@ -224,5 +224,4 @@ FID="/var/run/jail_${UNDhost_hostname}.id"
 [ ! -f "${FID}" ] || rm -f ${FID}
 
 [ -n "${mdsize}" -a "${mdsize}" != "0" -a -n "${MDFILE}" ] && unmountmd md=${MDFILE}
-[ -n "${ddns_zone_list}" ] && ddns mode=delete jname=${jname}
 /bin/rm -f ${ftmpdir}/${jname}.conf
diff --git a/system.subr b/system.subr
index 98e6d9140..cb72a67c8 100644
--- a/system.subr
+++ b/system.subr
@@ -162,12 +162,13 @@ get_kernel()
 # -a arch
 mountbase()
 {
-	local basepath kernelpath sourcepath objpath portspath distfilespath dbportspath MNTCODE
+	local basepath kernelpath sourcepath objpath portspath distfilespath distpackagepath dbportspath MNTCODE
 	local _base_mounted=0
 
 	# defaults
 	portspath="/usr/ports"
 	distfilespath="${tmpdir}/distfiles"
+	distpackagepath="${tmpdir}/usr/ports/packages"
 
 	xfstab="${ftmpdir}/mountbase.$$"
 	MNTCODE=0
@@ -251,10 +252,15 @@ mountbase()
 	if [ -n "${distfilespath}" ]; then
 		# we need for valid mount point on /usr/ports/distifles
 		[ ! -d /usr/ports/distfiles ] && /bin/mkdir -p /usr/ports/distfiles
+		[ ! -d /usr/ports/packages ] && /bin/mkdir -p /usr/ports/packages
 
 		[ ! -d "${distfilespath}" ] && /bin/mkdir -p ${distfilespath}
+		[ ! -d "${distpackagepath}" ] && /bin/mkdir -p ${distpackagepath}
+
 		[ ! -d "${path}/usr/ports/distfiles" ] && /bin/mkdir -p ${path}/usr/ports/distfiles
+		[ ! -d "${path}/usr/ports/packages" ] && /bin/mkdir -p ${path}/usr/ports/packages
 		${MOUNT_NULL_CMD} -orw ${distfilespath} ${path}/usr/ports/distfiles
+		${MOUNT_NULL_CMD} -orw ${distpackagepath} ${path}/usr/ports/packages
 	fi
 
 	# Finally mount devfs
diff --git a/tools/ddns b/tools/ddns
deleted file mode 100755
index d952ffa02..000000000
--- a/tools/ddns
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/usr/local/bin/cbsd
-#v9.2.2
-MYARG="jname mode"
-MYOPTARG=""
-MYDESC="Update DDNS records for jail"
-ADDHELP="mode=add,update or delete\n"
-
-. ${subr}
-. ${strings}
-init $*
-
-. ${jrcconf}
-[ $? -eq 1 ] && err 1 "${MAGENTA}No such jail: ${GREEN}${jname}${NORMAL}"
-
-[ -z "${ddns_zone_list}" ] && err 1 "Please set ddns_zone_list"
-
-for e in ${ddns_zone_list}; do
-    eval zonekey=\"\$ddns_key_${e}\"
-    eval zones=\"\$ddns_zones_${e}\"
-
-	if [ -z "${zonekey}" ]; then
-	    echo "Empty ddns_key_${e}"
-	    continue
-	fi
-
-	if [ ! -f "${zonekey}" ]; then
-	    echo "No such zone key ${e}. Use ddns_key_${e}= in rc.conf"
-	    continue
-	fi
-
-	if [ -z "${zones}" ]; then
-	    echo "Empty zones for ddns_zones_${e}"
-	    continue
-	fi
-
-    for a in ${zones}; do
-	for ip in ${ip4_addr}; do
-	    ipwmask $ip
-	    iptype $IWM
-	    case $? in
-		2) TYPE="IN AAAA" ;;
-		*) TYPE="IN A" ;;
-	    esac
-	    printf "update ${mode} ${a}. 10 ${TYPE} ${IWM}\nsend\nquit\n" | nsupdate -k ${zonekey}
-	done
-    done
-done
diff --git a/tools/fwcounters b/tools/fwcounters
index cfcacd92a..a4f2bb618 100755
--- a/tools/fwcounters
+++ b/tools/fwcounters
@@ -30,7 +30,7 @@ fwinit()
 	TRAFFILE="${TRAFDIR}/${CURDATE}.sqlite"
 
 	if [ ! -f "${TRAFFILE}" ]; then
-		/usr/local/bin/cbsd ${miscdir}/updatesql ${TRAFFILE} ${distdir}/share/local-fwcounters.schema
+		/usr/local/bin/cbsd ${miscdir}/updatesql ${TRAFFILE} ${distdir}/share/local-fwcounters.schema traffic
 		chown $cbsduser:$cbsduser ${TRAFFILE}
 	fi
 }
diff --git a/tools/imghelper b/tools/imghelper
index a71ac4144..9f68b89c1 100755
--- a/tools/imghelper
+++ b/tools/imghelper
@@ -1,9 +1,10 @@
 #!/usr/local/bin/cbsd
 #v10.3.0
 MYARG=""
-MYOPTARG="formfile bootstrap module jname updcol header inter"
+MYOPTARG="formfile bootstrap module jname updcol header inter table"
 MYDESC="Ncurses-based jail image boostrap helper"
-ADDHELP="updcol = new (default) update new column, cur - update cur column\n"
+ADDHELP="updcol = new (default) update new column, cur - update cur column\n\
+table - initial table, default is forms\n"
 EXTHELP="wf_imghelper.html"
 
 . ${subr}
@@ -27,6 +28,8 @@ fi
 
 init $*
 
+[ -z "${table}" ] && table="forms"
+
 if [ -n "${header}" ]; then
 	shift
 else
@@ -55,24 +58,41 @@ dialog_menu_main()
 
 	local menu_list=
 
-	local _id=1
-	local is_delimer=0
+	local _id=0
 
 	for _items in ${param}; do
 
-		unset VAL
+		_id=$(( _id + 1 ))
+
+		unset VAL _type
+		is_value=0
+		is_delimer=0
 
-		if [ "${_items}" == "-" ]; then
-			_items="forms_delimer_${_id}"
-			is_delimer=1
-			eval _mydesc="\$${_items}_desc"
-			VAL="${_mydesc}"
+		if [ "${_items}" = "-" ]; then
+			_type="delimer"
 		else
-			eval VAL=\$${_items}
-			is_delimer=0
-			eval _mydesc="\$${_items}_desc"
+			eval _type="\$${_items}_type"
 		fi
 
+		case "${_type}" in
+			subtable)
+				VAL=">>"
+				;;
+			hiddendelim)
+				continue
+				;;
+			delimer)
+				_items="forms_delimer_${_id}"
+				is_delimer=1
+				;;
+			*)
+				eval VAL=\$${_items}
+				is_value=1
+				;;
+		esac
+
+		eval _mydesc="\$${_items}_desc"
+
 		if [ ${is_delimer} -eq 1 ]; then
 			menu_list="${menu_list} '-'	'${_mydesc}'	'Field delimer'"
 		elif [ -z "${VAL}" ]; then
@@ -81,7 +101,6 @@ dialog_menu_main()
 			menu_list="${menu_list} '${_items}'	'${VAL}'	'${_mydesc}'"
 		fi
 
-		_id=$(( _id + 1 ))
 	done
 
 	menu_list="${menu_list} 'COMMIT'	'Save changes and quit'	'Save!'"
@@ -241,9 +260,12 @@ fi
 
 # update formfile
 [ ! -d "${workdir}/formfile" ] && /bin/mkdir ${workdir}/formfile
-mksitefile="${moduledir}/puppet.d/module_${module}/initforms.sh"
-[ ! -f "${mksitefile}" ] && err 1 "No ${mksitefile}"
-/bin/sh ${mksitefile}
+
+if [ -n "${module}" ]; then
+	mksitefile="${moduledir}/puppet.d/module_${module}/initforms.sh"
+	[ ! -f "${mksitefile}" ] && err 1 "No ${mksitefile}"
+	/bin/sh ${mksitefile}
+fi
 
 [ ! -f "${formfile}" ] && err 1 "Formfile doesn't exist: ${formfile}"
 
@@ -253,7 +275,24 @@ fi
 
 check_version
 
-param=$( cbsdsql ${formfile} SELECT param FROM forms ORDER by idx |/usr/bin/xargs )
+sql_part="SELECT param FROM ${table} WHERE type != \"subtable\""
+
+#for i in ${subtable_param}; do
+#	lnk=$( cbsdsql ${formfile} SELECT link FROM ${table} WHERE param = \"${i}\" )
+#	[ -z "${lnk}" ] && continue
+#	sql_part="${sql_part} UNION SELECT param FROM ${lnk} WHERE type != \"subtable\" AND mytable =\"${lnk}\""
+#done
+
+sql_part="${sql_part} ORDER BY order_id"
+
+param=$( cbsdsql ${formfile} ${sql_part} )
+
+#echo "${sql_part}"
+#exit 0
+
+#echo "$param"
+#exit 0
+
 load_forms
 load_new
 
diff --git a/tools/netinv b/tools/netinv
index c46341656..02371e848 100755
--- a/tools/netinv
+++ b/tools/netinv
@@ -14,7 +14,7 @@ init $*
 
 # create SQL schema
 ${miscdir}/sqlcli ${dbdir}/local.sqlite DROP TABLE IF EXISTS net
-/usr/local/bin/cbsd ${miscdir}/updatesql ${dbdir}/inv.${nodename}.sqlite ${distdir}/share/local-net.schema
+/usr/local/bin/cbsd ${miscdir}/updatesql ${dbdir}/inv.${nodename}.sqlite ${distdir}/share/local-net.schema net
 
 update_sql()
 {
@@ -78,7 +78,7 @@ FIBS=$( /sbin/sysctl -n net.fibs 2>/dev/null )
 [ -z "${FIBS}" ] && FIBS=0
 
 ${miscdir}/sqlcli ${dbdir}/local.sqlite DROP TABLE IF EXISTS gw
-/usr/local/bin/cbsd ${miscdir}/updatesql ${dbdir}/inv.${nodename}.sqlite ${distdir}/share/local-gw.schema
+/usr/local/bin/cbsd ${miscdir}/updatesql ${dbdir}/inv.${nodename}.sqlite ${distdir}/share/local-gw.schema gw
 
 [ -n "${GW4}" ] && ${miscdir}/sqlcli ${dbdir}/local.sqlite "INSERT INTO gw ( gw,val ) VALUES ( \"gw4\",\"$GW4\" )"
 [ -n "${GW6}" ] && ${miscdir}/sqlcli ${dbdir}/local.sqlite "INSERT INTO gw ( gw,val ) VALUES ( \"gw6\",\"$GW6\" )"
diff --git a/tools/rctlcounters b/tools/rctlcounters
index 1f67777d5..c1a3bc671 100755
--- a/tools/rctlcounters
+++ b/tools/rctlcounters
@@ -28,7 +28,7 @@ rctlinit()
 	RCTLFILE="${RCTLDIR}/${CURDATE}.sqlite"
 
 	if [ ! -f "${RCTLFILE}" ]; then
-		/usr/local/bin/cbsd ${miscdir}/updatesql ${RCTLFILE} ${distdir}/share/local-rctl.schema
+		/usr/local/bin/cbsd ${miscdir}/updatesql ${RCTLFILE} ${distdir}/share/local-rctl.schema rctl
 		/usr/sbin/chown $cbsduser:$cbsduser ${RCTLFILE}
 	fi
 }
diff --git a/tools/sysinv b/tools/sysinv
index 9b091108a..b3a2f3764 100755
--- a/tools/sysinv
+++ b/tools/sysinv
@@ -17,7 +17,7 @@ init $*
 
 # create SQL schema
 #${miscdir}/sqlcli ${dbdir}/local.sqlite DROP TABLE IF EXISTS local
-#/usr/local/bin/cbsd ${miscdir}/updatesql ${dbdir}/inv.${nodename}.sqlite ${distdir}/share/local-local.schema
+#/usr/local/bin/cbsd ${miscdir}/updatesql ${dbdir}/inv.${nodename}.sqlite ${distdir}/share/local-local.schema local
 
 collect_info()
 {
diff --git a/upgrade/post-patch-10.0.0.0 b/upgrade/post-patch-10.0.0.0
index e5722c6a0..fe391978b 100755
--- a/upgrade/post-patch-10.0.0.0
+++ b/upgrade/post-patch-10.0.0.0
@@ -28,7 +28,7 @@ for J in $( ${miscdir}/sqlcli ${dbdir}/local.sqlite select jname from jails 2>/d
 done
 
 ${miscdir}/sqlcli ${dbdir}/local.sqlite "drop table jails"
-/usr/local/bin/cbsd ${miscdir}/updatesql ${dbdir}/inv.${nodename}.sqlite ${distdir}/share/local-jails.schema
+/usr/local/bin/cbsd ${miscdir}/updatesql ${dbdir}/inv.${nodename}.sqlite ${distdir}/share/local-jails.schema jails
 
 for J in $( /bin/ls ${jailrcconfdir} ); do
 	jname=""
diff --git a/upgrade/post-patch-10.0.2.0 b/upgrade/post-patch-10.0.2.0
index 1af4696e0..24735995d 100755
--- a/upgrade/post-patch-10.0.2.0
+++ b/upgrade/post-patch-10.0.2.0
@@ -28,7 +28,7 @@ for J in $( ${miscdir}/sqlcli ${dbdir}/local.sqlite select jname from jails 2>/d
 done
 
 ${miscdir}/sqlcli ${dbdir}/local.sqlite "drop table jails"
-/usr/local/bin/cbsd ${miscdir}/updatesql ${dbdir}/inv.${nodename}.sqlite ${distdir}/share/local-jails.schema
+/usr/local/bin/cbsd ${miscdir}/updatesql ${dbdir}/inv.${nodename}.sqlite ${distdir}/share/local-jails.schema jails
 
 for J in $( /bin/ls ${jailrcconfdir} ); do
 	jname=""
diff --git a/upgrade/pre-patch-10.1.4.0 b/upgrade/pre-patch-10.1.4.0
index fb4f2c4e9..451ce3969 100755
--- a/upgrade/pre-patch-10.1.4.0
+++ b/upgrade/pre-patch-10.1.4.0
@@ -29,7 +29,7 @@ echo "  * Change nic_parent type from integer to text in local db on bhyvenic ta
 echo "    create backup of original base to /tmp/local.sqlite.$$"
 /bin/cp ${dbdir}/local.sqlite /tmp/local.sqlite.$$
 /usr/local/bin/sqlite3 ${dbdir}/local.sqlite "DROP TABLE bhyvenic"
-/usr/local/bin/cbsd ${miscdir}/updatesql ${dbdir}/local.sqlite ${distdir}/share/local-bhyvenic.schema
+/usr/local/bin/cbsd ${miscdir}/updatesql ${dbdir}/local.sqlite ${distdir}/share/local-bhyvenic.schema bhyvenic
 
 # back records
 for jname in ${bhyvevm}; do
diff --git a/upgrade/pre-patch-9.2.1.3 b/upgrade/pre-patch-9.2.1.3
index a4f595966..4d610bbdc 100755
--- a/upgrade/pre-patch-9.2.1.3
+++ b/upgrade/pre-patch-9.2.1.3
@@ -66,10 +66,10 @@ install -o ${cbsduser} -g ${cbsduser} -m 555 ${distdir}/jailctl/jregister ${work
 install -o ${cbsduser} -g ${cbsduser} -m 444 ${distdir}/securecmd ${workdir}/securecmd
 install -o ${cbsduser} -g ${cbsduser} -m 444 ${distdir}/share/jail-arg ${sharedir}/jail-arg
 
-${CBSD} ${miscdir}/updatesql ${dbdir}/inv.${nodename}.sqlite ${distdir}/share/local-local.schema
+${CBSD} ${miscdir}/updatesql ${dbdir}/inv.${nodename}.sqlite ${distdir}/share/local-local.schema local
 ${miscdir}/sqlcli ${dbdir}/inv.${nodename}.sqlite "insert into local ( nodename ) VALUES ( \"${nodename}\" )"
-${CBSD} ${miscdir}/updatesql ${dbdir}/inv.${nodename}.sqlite ${distdir}/share/local-jails.schema
-${CBSD} ${miscdir}/updatesql ${dbdir}/inv.${nodename}.sqlite ${distdir}/share/local-unconfigured.schema
+${CBSD} ${miscdir}/updatesql ${dbdir}/inv.${nodename}.sqlite ${distdir}/share/local-jails.schema jails
+${CBSD} ${miscdir}/updatesql ${dbdir}/inv.${nodename}.sqlite ${distdir}/share/local-unconfigured.schema unconfigured
 chown ${cbsduser} ${dbdir}/inv.${nodename}.sqlite
 
 /bin/ln -sfh ${dbdir}/inv.${nodename}.sqlite ${dbdir}/local.sqlite