diff --git a/Products/zms/_objattrs.py b/Products/zms/_objattrs.py
index 392d2d178..624a41350 100644
--- a/Products/zms/_objattrs.py
+++ b/Products/zms/_objattrs.py
@@ -723,14 +723,17 @@ def isActive(self, REQUEST):
     def formatObjAttrValue(self, obj_attr, v, lang=None):
       
       #-- DATATYPE
-      datatype = obj_attr.get('datatype_key', _globals.DT_UNKNOWN)
+      try:
+        datatype = obj_attr.get('datatype_key', _globals.DT_UNKNOWN)
+      except:
+        datatype = _globals.DT_UNKNOWN
       
       #-- VALUE
       if isinstance(v, str):
         chars = ''.join([ x for x in string.whitespace if x != '\t'])
         v = v.strip(chars)
       # Retrieve v from options.
-      if 'options' in obj_attr:
+      if obj_attr is not None and 'options' in obj_attr:
         options = obj_attr['options']
         try: 
           i = options.index(int(v))
diff --git a/Products/zms/import/exampledb.metaobj.xml b/Products/zms/import/exampledb.metaobj.xml
index 456800ad8..50f1840c3 100644
--- a/Products/zms/import/exampledb.metaobj.xml
+++ b/Products/zms/import/exampledb.metaobj.xml
@@ -14,7 +14,7 @@
           <item key="id"><![CDATA[com.zms.db.example]]></item>
           <item key="name"><![CDATA[com.zms.db.example]]></item>
           <item key="package"></item>
-          <item key="revision"><![CDATA[3.0.a]]></item>
+          <item key="revision"><![CDATA[5.0.0]]></item>
           <item key="type"><![CDATA[ZMSPackage]]></item>
         </dictionary>
       </item>
@@ -96,7 +96,7 @@
 			records python:zmscontext.attr(metaObjAttrIds[0]);
 			metaObjAttrs python:[x for x in metaObj['attrs'][1:] if 
 					x['id'] not in ['sort_id']
-					and x['custom']
+					and x.get('custom')
 					and x['type'] in zmscontext.metaobj_manager.valid_types
 					and not x['type'] in ['password']
 					]">
@@ -108,7 +108,7 @@
 		<div class="form-group row" style="margin:.5em">
 			<div class="input-group">
 				<input type="hidden" tal:attributes="name python:'filterattr%i'%filterIndex" value="%">
-				<input class="form-control form-control-sm" type="text" tal:attributes="name python:'filtervalue%i'%filterIndex; value python:request.SESSION.get('filtervalue%i_%s'%(filterIndex,zmscontext.id),'')" />
+				<input class="form-control" type="text" tal:attributes="name python:'filtervalue%i'%filterIndex; value python:request.SESSION.get('filtervalue%i_%s'%(filterIndex,zmscontext.id),'')" />
 				<div class="input-group-append">
 					<button type="submit" name="btn" class="btn btn-secondary" value="BTN_SEARCH" tal:attributes="title python:here.getZMILangStr('BTN_SEARCH')"><i class="fas fa-search"></i></button>
 					<button type="submit" name="btn" class="btn btn-secondary" value="BTN_RESET" tal:attributes="title python:here.getZMILangStr('BTN_RESET')"><i class="fas fa-times"></i></button>
@@ -159,7 +159,7 @@
           <item key="id"><![CDATA[dept]]></item>
           <item key="name"><![CDATA[Departments]]></item>
           <item key="package"><![CDATA[com.zms.db.example]]></item>
-          <item key="revision"><![CDATA[3.0.0]]></item>
+          <item key="revision"><![CDATA[5.0.0]]></item>
           <item key="type"><![CDATA[ZMSRecordSet]]></item>
         </dictionary>
       </item>
@@ -301,7 +301,7 @@
 			records python:zmscontext.attr(metaObjAttrIds[0]);
 			metaObjAttrs python:[x for x in metaObj['attrs'][1:] if 
 					x['id'] not in ['sort_id']
-					and x['custom']
+					and x.get('custom')
 					and x['type'] in zmscontext.metaobj_manager.valid_types
 					and not x['type'] in ['password']
 					]">
@@ -313,7 +313,7 @@
 		<div class="form-group row" style="margin:.5em">
 			<div class="input-group">
 				<input type="hidden" tal:attributes="name python:'filterattr%i'%filterIndex" value="%">
-				<input class="form-control form-control-sm" type="text" tal:attributes="name python:'filtervalue%i'%filterIndex; value python:request.SESSION.get('filtervalue%i_%s'%(filterIndex,zmscontext.id),'')" />
+				<input class="form-control" type="text" tal:attributes="name python:'filtervalue%i'%filterIndex; value python:request.SESSION.get('filtervalue%i_%s'%(filterIndex,zmscontext.id),'')" />
 				<div class="input-group-append">
 					<button type="submit" name="btn" class="btn btn-secondary" value="BTN_SEARCH" tal:attributes="title python:here.getZMILangStr('BTN_SEARCH')"><i class="fas fa-search"></i></button>
 					<button type="submit" name="btn" class="btn btn-secondary" value="BTN_RESET" tal:attributes="title python:here.getZMILangStr('BTN_RESET')"><i class="fas fa-times"></i></button>
@@ -364,7 +364,7 @@
           <item key="id"><![CDATA[emp]]></item>
           <item key="name"><![CDATA[Employees]]></item>
           <item key="package"><![CDATA[com.zms.db.example]]></item>
-          <item key="revision"><![CDATA[3.0.a]]></item>
+          <item key="revision"><![CDATA[5.0.0]]></item>
           <item key="type"><![CDATA[ZMSRecordSet]]></item>
         </dictionary>
       </item>
@@ -480,7 +480,7 @@
           <item key="id"><![CDATA[exampleDatabase]]></item>
           <item key="name"><![CDATA[Example-Database]]></item>
           <item key="package"><![CDATA[com.zms.db.example]]></item>
-          <item key="revision"><![CDATA[3.0.a]]></item>
+          <item key="revision"><![CDATA[5.0.0]]></item>
           <item key="type"><![CDATA[ZMSDocument]]></item>
         </dictionary>
       </item>
diff --git a/Products/zms/plugins/www/bootstrap/plugin/bootstrap.plugin.zmi.js b/Products/zms/plugins/www/bootstrap/plugin/bootstrap.plugin.zmi.js
index 2c52a83b9..59a624dba 100644
--- a/Products/zms/plugins/www/bootstrap/plugin/bootstrap.plugin.zmi.js
+++ b/Products/zms/plugins/www/bootstrap/plugin/bootstrap.plugin.zmi.js
@@ -550,7 +550,7 @@ $ZMI.registerReady(function(){
 	$ZMI.setCursorAuto("EO bootstrap.plugin.zmi");
 
 	// Set Save-Button Behaviour: Menu Lock
-	$('#menulock').prop('checked', JSON.parse($ZMILocalStorageAPI.get('ZMS.menulock',false)));
+	$('#menulock').val(JSON.parse($ZMILocalStorageAPI.get('ZMS.menulock',0)));
 
 	// ZMSLightbox
 	$('a.zmslightbox, a.fancybox')
@@ -1755,7 +1755,7 @@ function zmiActionButtonsRefresh(sender,evt) {
  * @param v Boolean value for new (un-)checked state.
  */
 function zmiToggleSelectionButtonClick(sender,v) {
-	var $fm = $(sender).parents('form,.zmi-form-container');
+	var $fm = $(sender).closest('form,.zmi-form-container');
 	var $inputs = $('input:checkbox:not([id~="active"]):not([id~="attr_dc_coverage"])',$fm);
 	if (typeof v == "undefined") {
 		v = !$inputs.prop('checked');
diff --git a/Products/zms/plugins/www/zmi.core.css b/Products/zms/plugins/www/zmi.core.css
index 9fca5a6df..a77c23822 100644
--- a/Products/zms/plugins/www/zmi.core.css
+++ b/Products/zms/plugins/www/zmi.core.css
@@ -1128,6 +1128,17 @@ input.btn.btn-file {
 	text-align:right;
 	width:100%;
 }
+.zmi .controls.save .btn:not(:last-child) {
+	margin-right:0.25rem;
+}
+.zmi .controls.save dialog#menulock_btn {
+	/* Hint: is dialog element for react on focus/click event */
+	display:inline-block;
+	position: relative;
+}
+.zmi .controls.save dialog#menulock_btn #menulock[value='0'] + #menulock_icon {
+	color:#bfc8cf;
+}
 .zmi .single-line {
 	width:100%;
 	flex-wrap:nowrap;
diff --git a/Products/zms/zpt/ZMSIndex/manage_main.zpt b/Products/zms/zpt/ZMSIndex/manage_main.zpt
index 03b855174..f38e5d01c 100644
--- a/Products/zms/zpt/ZMSIndex/manage_main.zpt
+++ b/Products/zms/zpt/ZMSIndex/manage_main.zpt
@@ -35,7 +35,7 @@ function openWindow(url) {
 <legend>ZMSIndex</legend>
 <div id="zmsindex" class="collapse show">
 <div class="card-body">
-	<div class="form-group zms4-row mb-0">
+	<div class="form-group zmi-form-container  zms4-row mb-0">
 		<div class="col-sm-12" data-label="ZMS-Clients">
 			<div class="zmi-sitemap-controls-container">
 				<div class="btn-group zmi-sitemap-controls">
diff --git a/Products/zms/zpt/ZMSMetacmdProvider/manage_main.zpt b/Products/zms/zpt/ZMSMetacmdProvider/manage_main.zpt
index 09226d6fc..c310992c9 100644
--- a/Products/zms/zpt/ZMSMetacmdProvider/manage_main.zpt
+++ b/Products/zms/zpt/ZMSMetacmdProvider/manage_main.zpt
@@ -186,21 +186,21 @@
 			<input type="hidden" name="lang" tal:attributes="value request/lang">
 			<div class="form-group col-12">
 				<div class="custom-file">
-					<input type="file" name="file" id="file" class="custom-file-input" value="" 
+					<input type="file" name="file" id="file" class="custom-file-input" value=""
 						onchange="$('.custom-file label span').html($(this).val().replace(/^.*(\\|\/|\:)/, ''));" />
 					<label class="custom-file-label" for="file"><span tal:content="python:here.getZMILangStr('ATTR_FILE')">Choose file</span></label>
 				</div>
 			</div><!-- .form-group -->
 			<label class="col-12 control-label text-left"><span tal:content="python:here.getZMILangStr('OR').lower()">Or</span></label>
 			<div class="form-group col-12 mt-2">
-				<select id="init" name="init" multiple="multiple" class="form-control" 
-					onfocus="zmiExpandConfFiles(this,'.metacmd.');$(this).addClass('expand');" 
+				<select id="init" name="init" multiple="multiple" class="form-control"
+					onfocus="zmiExpandConfFiles(this,'.metacmd.');$(this).addClass('expand');"
 					onmouseover="zmiExpandConfFiles(this,'.metacmd.')">
 					<option value="">--- <tal:block tal:content="python:here.getZMILangStr('BTN_INIT')">Init</tal:block>... ---</option>
 				</select>
 				<style>
 					/*<!--*/
-						#init { 
+						#init {
 							height:2rem;
 							overflow:unset !important;
 							overflow-x: hidden;
@@ -220,7 +220,7 @@
 			<div class="form-group row mt-5 mr-0">
 				<div class="controls save">
 					<button name="btn" type="submit" class="btn btn-primary" value="BTN_IMPORT" tal:content="python:here.getZMILangStr('BTN_IMPORT')">Import</button>
-					<button class="btn btn-secondary ml-1" 
+					<button class="btn btn-secondary ml-1"
 						title="Check-Up: Compare working content model with the current ZMS source files."
 						onclick="$ZMI.iframe('./manage_customize_diff',{lang:getZMILang(),provider_id:'metacmd_manager',action:'manage_changeMetacmds'},{iframe:true,height:'600',title:$(this).attr('title')});return false">
 						<i class="fas fa-code-branch"></i>
@@ -233,8 +233,8 @@
 
 <form class="form-horizontal card" tal:attributes="action action" method="post" enctype="multipart/form-data">
 	<input type="hidden" name="lang" tal:attributes="value request/lang">
-	<legend class="has_tooltip" 
-		tal:attributes="title python:here.getZMILangStr('TIP_METACMD')" 
+	<legend class="has_tooltip"
+		tal:attributes="title python:here.getZMILangStr('TIP_METACMD')"
 		tal:content="python:here.getZMILangStr('TAB_METACMD')">
 		Metacmd
 	</legend>
@@ -284,9 +284,9 @@
 			<tal:block tal:define="
 					ob python:getattr(here,metaCmd['id'],None);
 					revision python:metaCmd.get('revision','0.0.0');">
-				<tr class="zmi-selectable" 
+				<tr class="zmi-selectable"
 					tal:attributes="
-						data-package package; 
+						data-package package;
 						class python:(ob is None) and 'text-danger table-danger' or '';
 						title python:(ob is None) and '%s not found'%metaCmd['id'] or ''">
 					<td class="meta-ids text-center">
@@ -298,8 +298,8 @@
 							<tal:block tal:condition="python:metaCmd.get('acquired',False)">
 								<a target="_blank" data-turbolinks="false"
 									tal:attributes="
-										href python:'%s/metacmd_manager/manage_main?lang=%s&id=%s'%(context.getRootElement().absolute_url(),request['lang'],metaCmd['id']);
-										title python:'acquired from: %s (%s)'%(context.getRootElement().getHome().id, context.getRootElement().attr('titlealt'))"
+										href python:'%s/metacmd_manager/manage_main?lang=%s&id=%s'%(context.getHome().aq_parent.content.absolute_url(),request['lang'],metaCmd['id']);
+										title python:'acquired from: %s (%s)'%(context.getHome().aq_parent.content.id, context.getHome().aq_parent.content.attr('titlealt'))"
 									><i class="fas fa-share"></i></a>
 								<i tal:condition="python:metaCmd.get('icon_clazz',False)" tal:attributes="class python:metaCmd.get('icon_clazz')"></i>&nbsp;&nbsp;
 								<strong tal:content="python:metaCmd['id']">the id</strong> ( <tal:block tal:content="python:here.getZMILangStr(metaCmd['name'])">Name</tal:block> )
@@ -312,7 +312,7 @@
 									(<tal:block tal:content="python:here.getZMILangStr(metaCmd['name'])">the name</tal:block>)
 								</a>
 							</tal:block>
-							<tal:block tal:content="revision">the version</tal:block> 
+							<tal:block tal:content="revision">the version</tal:block>
 							(<tal:block tal:content="python:metaCmd['meta_type']">the type</tal:block>)
 						</tal:block>
 						<tal:block tal:condition="python:ob is None"
@@ -424,4 +424,4 @@ $(function(){
 
 <footer tal:replace="structure python:here.zmi_body_footer(here,request)">zmi_body_footer</footer>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/Products/zms/zpt/ZMSMetamodelProvider/manage_main.zpt b/Products/zms/zpt/ZMSMetamodelProvider/manage_main.zpt
index a3f9ca4cb..e55d46c5d 100644
--- a/Products/zms/zpt/ZMSMetamodelProvider/manage_main.zpt
+++ b/Products/zms/zpt/ZMSMetamodelProvider/manage_main.zpt
@@ -1,6 +1,6 @@
 <tal:block tal:define="
-	dummy0 python:here.zmi_page_request(here,request); 
-	global standard modules/Products.zms/standard; 
+	dummy0 python:here.zmi_page_request(here,request);
+	global standard modules/Products.zms/standard;
 	global zopeutil modules/Products/zms/zopeutil;
 	global session python:standard.get_session(here);"></tal:block
 ><tal:block tal:condition="python:standard.get_session_value(here,'zmi-manage-system',0)==1"><tal:block tal:content="structure python:here.manage_system(here,request)"></tal:block></tal:block
@@ -127,8 +127,8 @@
 			</div>
 			<a tal:condition="python:metaObj.get('acquired',None)" class="btn btn-secondary" target="_blank"
 				tal:attributes="
-					href python:'%s/metaobj_manager/manage_main?lang=%s&id=%s'%(context.getRootElement().absolute_url(),request['lang'],metaObj['id']);
-					title python:'acquired YYY from: %s (%s)'%(context.getRootElement().getHome().id, context.getRootElement().attr('titlealt'))"
+					href python:'%s/metaobj_manager/manage_main?lang=%s&id=%s'%(context.getHome().aq_parent.content.absolute_url(),request['lang'],metaObj['id']);
+					title python:'acquired from: %s (%s)'%(context.getHome().aq_parent.content.id, context.getHome().aq_parent.content.attr('titlealt'))"
 				><i class="fas fa-share" title="acquired"></i></a>
 			<a class="btn btn-secondary" target="_blank" value="BTN_SEARCH"
 				tal:attributes="
@@ -157,8 +157,8 @@
 		<tr class="row_metadata">
 			<td class="meta-sort">
 				<span tal:content="python:here.getZMILangStr('ATTR_VERSION')">Version</span>
-				<input title="Object Revision Scheme 0.0.0" class="form-control form-control-sm" 
-					placeholder="0.0.0" pattern="[\d]*\.[\d]*\.[\d]*" 
+				<input title="Object Revision Scheme 0.0.0" class="form-control form-control-sm"
+					placeholder="0.0.0" pattern="[\d]*\.[\d]*\.[\d]*"
 					type="text" id="obj_revision" name="obj_revision" size="6"
 					tal:attributes="value python:here.getMetaobjRevision(metaObj['id'])"/>
 			</td>
@@ -201,7 +201,7 @@
 		</tr>
 
 		<tbody tal:define="req_attr_id_match python:request.get('attr_id') in objAttrIds">
-			<tr tal:repeat="objAttrId objAttrIds" 
+			<tr tal:repeat="objAttrId objAttrIds"
 				tal:attributes="class python:request.get('attr_id') and ( ( req_attr_id_match and request.get('attr_id')==objAttrId ) and 'zmi-selected table-warning' or ( ( not req_attr_id_match and ( len(request.get('attr_id'))>1 and request.get('attr_id') in objAttrId ) ) and  'zmi-selected table-warning' or '' ) );">
 				<tal:block tal:define="
 						objAttr python:metaObjAttrs[objAttrIds.index(objAttrId)];
@@ -209,13 +209,13 @@
 					<td class="meta-sort">
 						<input type="hidden" name="old_ids:list" tal:attributes="value objAttr/id"/>
 						<div class="input-group input-group-sm">
-							<select class="zmi-sort" 
+							<select class="zmi-sort"
 								tal:attributes="title python:here.getZMILangStr('ATTR_ORDERBY');
 									onchange python:'zmiFormSubmit(this,{btn:\'move_to\',key:\'attr\',attr_id:\'%s\',\'pos:int\':this.selectedIndex})'%objAttrId;">
 								<option tal:repeat="i python:range(0,len(objAttrIds))" tal:attributes="selected python:['','selected'][i==objAttrIds.index(objAttrId)]" tal:content="python:i+1">i+1</option>
 							</select>
 							<div class="input-group-append">
-								<a class="btn btn-secondary" href="javascript:;" 
+								<a class="btn btn-secondary" href="javascript:;"
 									tal:attributes="title python:here.getZMILangStr('BTN_DELETE');
 										onclick python:'javascript:zmiDeleteObjBtnClick(this,{btn:\'BTN_DELETE\',key:\'attr\',attr_id:\'%s\'})'%objAttrId;"
 									><i class="fas fa-times"></i></a>
@@ -226,7 +226,7 @@
 					<td class="meta-name" tal:attributes="title python:here.getZMILangStr('ATTR_DISPLAY')"><input type="text" tal:attributes="name python:'attr_name_%s'%objAttrId; value python:objAttr['name']; class python:['form-control form-control-sm','form-control form-control-sm zmi-element-disabled'][isMetaDictAttr]"/></td>
 
 					<tal:block tal:condition="python:objAttr['type'] in ['interface','method','py','resource','zpt']+here.valid_zopetypes">
-						<td tal:condition="python:objAttr['type'] not in here.valid_uploadtypes and objAttr.get('ob') is not None" 
+						<td tal:condition="python:objAttr['type'] not in here.valid_uploadtypes and objAttr.get('ob') is not None"
 							tal:attributes="title python:here.getZMILangStr('ATTR_TYPE')"
 							colspan="5" class="meta-code"
 							><tal:block tal:define="
@@ -240,16 +240,16 @@
 										global errors python:lines[lines.index('## Errors:')+1][2:].strip()"></tal:block
 								></tal:block>
 								<input type="hidden" class="content_type" tal:attributes="name python:'attr_type_%s'%objAttr['id']; value python:[objAttr.get('type'),objAttr.get('meta_type')][objAttr.get('meta_type') in here.getMetadictAttrs()]" />
-								<div class="single-line zmi-code" 
+								<div class="single-line zmi-code"
 									tal:condition="python:objAttr.get('ob') is not None"
 									tal:define="zopetype python:objAttr['type'] in here.valid_zopetypes; ob python:objAttr.get('ob')">
-									<code class="debug" title="Class Products.zms.zopeutil.MissingArtefactProxy" 
+									<code class="debug" title="Class Products.zms.zopeutil.MissingArtefactProxy"
 										tal:condition="python:objAttr.get('ob').absolute_url()=='#'"
 										tal:content="python:'ERROR: Object not created %s'%(objAttr.get('ob'))">
-										ERROR: Object not created 
+										ERROR: Object not created
 									</code>
 									<textarea class="form-control-ace-editor form-control form-control-sm"
-										tal:attributes="name python:'attr_custom_%s'%objAttr['id']; 
+										tal:attributes="name python:'attr_custom_%s'%objAttr['id'];
 											id  python:'attr_custom_%s'%(str(objAttr['id']).replace('/','__'));
 											data-content_type python:objAttr['type'];
 											title python:['%s (%s) - Double-Click for Code-Editor'%(objAttr['id'],objAttr['type']),errors][len(errors)>0];
@@ -262,23 +262,23 @@
 								</div>
 							</tal:block>
 						</td>
-						<td tal:condition="python:objAttr['type'] in here.valid_uploadtypes" 
+						<td tal:condition="python:objAttr['type'] in here.valid_uploadtypes"
 							tal:attributes="title python:here.getZMILangStr('ATTR_TYPE')"
 							colspan="5" class="meta-resource input-group-sm"
 							><div class="meta-resource-container">
 								<input type="hidden" tal:attributes="name python:'attr_type_%s'%objAttr['id']; value objAttr/type"/>
 								<input class="btn btn-file" type="file" tal:attributes="name python:'attr_custom_%s'%objAttr['id']"/>
 								<tal:block tal:condition="python:objAttr.get('ob')">
-									<a tal:define="fname python:objAttr['ob'].title" 
-										tal:attributes="href python:'%s/manage_main'%(objAttr['ob'].absolute_url()); 
-											title python:'Edit %s [%s]'%(fname,here.getDataSizeStr(objAttr['ob'].get_size()))" 
+									<a tal:define="fname python:objAttr['ob'].title"
+										tal:attributes="href python:'%s/manage_main'%(objAttr['ob'].absolute_url());
+											title python:'Edit %s [%s]'%(fname,here.getDataSizeStr(objAttr['ob'].get_size()))"
 										target="_blank" style="text-decoration:none;">
 										<i class="fas fa-file-alt"></i>
 										<tal:block tal:content="fname">FILE NAME</tal:block>
 									</a>
 								</tal:block>
 							</div>
-							<span tal:condition="python:objAttr['id']=='readme'" 
+							<span tal:condition="python:objAttr['id']=='readme'"
 								title="Readme" class="zmi-readme text-info float-right btn-sm mr-2 d-none d-lg-block"
 								tal:attributes="onclick python:'window.open(\'./metaobj_manager/%s.readme/manage_readme_iframe\')'%(id)">
 								<i class="far fa-question-circle"></i>
@@ -350,7 +350,7 @@
 	</table>
 
 	<!-- BO Usage -->
-	<div class="meta-usage px-2 pb-2" style="margin-top: -0.5rem;" 
+	<div class="meta-usage px-2 pb-2" style="margin-top: -0.5rem;"
 		tal:define="l python:[]"
 		><tal:block tal:repeat="metaObj2 metaObjs"
 			><tal:block tal:define="objAttrs python:here.getMetaobjAttrs(metaObj2['id'])"
@@ -360,7 +360,7 @@
 						<tal:block tal:condition="not:python:len(l)==0">,</tal:block
 						><a target="_blank" class="text-decoration-none"
 							tal:define="dummy0 python:l.append(1)"
-							tal:attributes="href python:'%s?lang=%s&id=%s'%(request['URL'],request['lang'],metaObj2['id']); 
+							tal:attributes="href python:'%s?lang=%s&id=%s'%(request['URL'],request['lang'],metaObj2['id']);
 								title python:'%s (%s)'%(metaObj2['name'],objAttr['name'])"
 									><i tal:on-error="string:ERROR icon" tal:attributes="class python:'%s mx-2'%(zmscontext.zmi_icon(metaObj['id']))"></i><tal:block
 									tal:content="python:'%s.%s'%(metaObj2['id'],objAttr['id'])">
@@ -374,7 +374,7 @@
 	<!-- EO Usage -->
 
 	<!-- BO Languages -->
-	<table id="meta_languages" 
+	<table id="meta_languages"
 		tal:define="langIds python:here.getLangIds(sort=True)"
 		class="table table-sm table-striped table-bordered table-hover mt-3">
 		<thead>
@@ -389,14 +389,14 @@
 			<tr tal:condition="python:langDict['key'].startswith(request['id'])" tal:define="i python:repeat['langDict'].index+1">
 				<td class="meta-sort"></td>
 				<td>
-					<input type="text" class="form-control form-control-sm" 
+					<input type="text" class="form-control form-control-sm"
 						tal:attributes="name python:'_lang_dict_key_%i'%i; value python:langDict['key'][len(request['id'])+1:];" />
 				</td>
 				<td tal:repeat="langId langIds">
 					<div class="single-line">
-						<textarea class="form-control form-control-sm" 
+						<textarea class="form-control form-control-sm"
 							tal:attributes="name python:'_lang_dict_value_%i_%s'%(i,langId);
-								title python:' %s (%s)'%(langDict['key'][len(request['id'])+1:],langId);" 
+								title python:' %s (%s)'%(langDict['key'][len(request['id'])+1:],langId);"
 							tal:content="python:langDict.get(langId,'')"></textarea>
 					</div>
 				</td>
@@ -484,8 +484,8 @@
 
 <form tal:condition="python:not request.get('id')" class="form-horizontal card" action="manage_changeProperties" method="post" enctype="multipart/form-data">
 	<input type="hidden" name="lang" tal:attributes="value request/lang"/>
-	<legend class="has_tooltip" 
-		tal:attributes="title python:here.getZMILangStr('TIP_METAOBJ')" 
+	<legend class="has_tooltip"
+		tal:attributes="title python:here.getZMILangStr('TIP_METAOBJ')"
 		tal:content="python:here.getZMILangStr('TAB_METAOBJ')">
 		Metaobj
 	</legend>
@@ -515,7 +515,7 @@
 	<tbody>
 	<tal:block tal:repeat="metaObjPackage python:here.sort_list(metaObjPackages+metaObjPackages2)">
 		<tal:block tal:condition="python:metaObjPackage in metaObjPackages">
-			<tr id="pack_default" class="meta-package" 
+			<tr id="pack_default" class="meta-package"
 				tal:define="global metaObj python:here.getMetaobj(metaObjPackage)"
 				tal:attributes="id python:'pack_%s'%(metaObjPackage and metaObjPackage or 'default')">
 				<td style="text-align:center;" class="meta-check">
@@ -524,7 +524,7 @@
 				<td colspan="2" class="meta-id">
 					<tal:block tal:condition="python:metaObjPackage"
 						><i tal:condition="python:metaObj.get('acquired',None)" class="fas fa-share" title="acquired"></i>
-						<a tal:condition="python:metaObjPackage" data-turbolinks="false" 
+						<a tal:condition="python:metaObjPackage" data-turbolinks="false"
 							tal:attributes="href python:'manage_bigpicture?lang=%s&id=%s'%(request['lang'],metaObjPackage); title python:'%s - Click for big picture...'%metaObjPackage" target="_blank"
 							><i class="fas fa-briefcase"></i></a>
 						&nbsp;
@@ -562,8 +562,8 @@
 					<span tal:attributes="id python:metaObj['id'];title python:metaObj['id'];class python:' '.join([[''],['enabled']][metaObj.get('enabled',0) in [1,True]])">
 						<a tal:condition="python:metaObj.get('acquired',None)" target="_blank"
 							tal:attributes="
-								href python:'%s/metaobj_manager/manage_main?lang=%s&id=%s'%(context.getRootElement().absolute_url(),request['lang'],metaObj['id']);
-								title python:'acquired from: %s (%s)'%(context.getRootElement().getHome().id, context.getRootElement().attr('titlealt'))"
+								href python:'%s/metaobj_manager/manage_main?lang=%s&id=%s'%(context.getHome().aq_parent.content.absolute_url(),request['lang'],metaObj['id']);
+								title python:'acquired from: %s (%s)'%(context.getHome().aq_parent.content.id, context.getHome().aq_parent.content.attr('titlealt'))"
 							><i class="fas fa-share"></i></a>
 						<a title="Enabled" href="javascript:;" onclick="zmiEnabledBtnClick(this)"><i tal:attributes="class python:' '.join(['enabled-toggle']+[['far fa-square'],['far fa-check-square']][metaObj.get('enabled',0) in [1,True]])"></i></a>
 						<a tal:attributes="href python:'manage_analyze?lang=%s&id=%s'%(request['lang'],metaObj['id']); title python:'%s - Click for content analysis...'%metaObj['id']" target="_blank"><i tal:on-error="string:ERROR icon" tal:attributes="class python:zmscontext.zmi_icon(metaObj['id'])"></i></a>
@@ -702,7 +702,7 @@ $(function(){
 /**
  * ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
  * Generator for Default-ZPT-Code.
- * Cave: ZPT Processing in Zope5 requires $$ 
+ * Cave: ZPT Processing in Zope5 requires $$
  * for JS String Templates
  * ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
  */
@@ -729,11 +729,11 @@ $(function(){
 			meta_type = $('.meta-code > :first-child', this).val();
 		}
 		var meta_repetitive = $('.meta-repetitive > :first-child', this).prop('checked');
-		if ( 
-			meta_id && 
-			meta_type && 
+		if (
+			meta_id &&
+			meta_type &&
 			meta_id_ignored.indexOf(meta_id)==-1 &&
-			meta_type_ignored.indexOf(meta_type)==-1 
+			meta_type_ignored.indexOf(meta_type)==-1
 			) {
 			meta_model[meta_id] = { 'meta_type':meta_type,'meta_repetitive':meta_repetitive };
 		}
@@ -758,12 +758,12 @@ $(function(){
 		var id = String(item);
 		var sid = shorten_id(id);
 		if ( meta_model[id]['meta_type'] =='url' ) {
-			// ATTRTYPE URL 
+			// ATTRTYPE URL
 			tal_defs += `\n\t\t${sid} python:zmscontext.attr('${id}');`
 			tal_defs += `\n\t\t${sid}_obj python:'{' in ${sid} and zmscontext.getLinkObj(${sid},request) or None;`
 			tal_defs += `\n\t\t${sid}_target python:${sid}_obj and ${sid}_obj.getHref2IndexHtml(request) or ${sid};`
 		} else if ( meta_model[id]['meta_repetitive'] ) {
-			// ATTRTYPE COMPLEX/REPETITIVE 
+			// ATTRTYPE COMPLEX/REPETITIVE
 			if (meta_model[id]['meta_type']!='*') {
 				tal_defs +=`\n\t\t${sid}_list python:zmscontext.filteredChildNodes(request,'${meta_model[id]['meta_type']}');`
 			} else {
@@ -786,7 +786,7 @@ $(function(){
 			// ATTRTYPE IMAGE
 			tal_content += `\n\t<img class="${sid}" tal:attributes="src python:${sid}.getHref(request)" alt="Image" />`;
 		} else if ( meta_model[id]['meta_type']=='url' ) {
-			// ATTRTYPE URL 
+			// ATTRTYPE URL
 			tal_content += `\n\t<a class="${sid}" tal:condition="${sid}" tal:attributes="href python:${sid}_obj and ${sid}_target or ${sid}; target python:${sid}_obj and '_self' or '_blank';">Link...</a>`;
 		} else if ( meta_model[id]['meta_type'] == 'file' ) {
 			// ATTRTYPE FILE
@@ -798,7 +798,7 @@ $(function(){
 			// ATTRTYPE DATE/TIME
 			tal_content += `\n\t<div class="${sid}" tal:condition="${sid}" tal:content="python:zmscontext.getLangFmtDate(${sid},request.get('lang'))">${sid}</div>`;
 		} else if ( meta_model[id]['meta_repetitive'] ) {
-			// ATTRTYPE COMPLEX/REPETITIVE 
+			// ATTRTYPE COMPLEX/REPETITIVE
 			tal_content += `\n\t<div class="${sid} repetitive" tal:condition="${sid}_list">\n\t\t<tal:block tal:repeat="${sid}_listitem ${sid}_list" tal:content="structure python:${sid}_listitem.renderShort(request)">${sid}</tal:block>\n\t</div>`;
 		} else if ( meta_model[id]['meta_type'] =='Script (Python)' ) {
 			// ATTRTYPE PYTHON SCRIPT (ZOPE OBJECT)
@@ -812,9 +812,9 @@ $(function(){
 	// Render TAL-Code-Templates Parts
 	Object.keys(meta_model).forEach(tal_def_render);
 	Object.keys(meta_model).forEach(tal_content_render);
-	
+
 	// Assemble TAL-Code
-	var default_template = `<div title="Default-ZPT-Code" 
+	var default_template = `<div title="Default-ZPT-Code"
 		tal:define="zmscontext options/zmscontext;
 		id python:zmscontext.getId();
 		css_class python:zmscontext.meta_id;${tal_defs}"
@@ -851,7 +851,7 @@ $(function(){
 	$(".row_insert .btn-add").click(function(){
 		new_row_counter++;
 
-		// Where to insert the new row 
+		// Where to insert the new row
 		let $where_insert = $(this).closest('tr');
 
 		// Set variables
@@ -859,7 +859,7 @@ $(function(){
 		let new_row_name = `new_row_${table_id}_${new_row_counter}`;
 		let old_id_html = (table_id != 'meta_languages') ? `<input type="hidden" name="old_ids:list" value="new${new_row_counter}">` : ``;
 		let new_btn_html = `${old_id_html}
-			<span class="btn btn-default btn-sm mr-1" style="color:#999" 
+			<span class="btn btn-default btn-sm mr-1" style="color:#999"
 				onclick="javascript:$(this).closest('tr').remove()">
 				<i class="fas fa-times"></i>
 			</span>
@@ -925,4 +925,4 @@ $(function(){
 
 </body>
 </html>
-</tal:block>
\ No newline at end of file
+</tal:block>
diff --git a/Products/zms/zpt/ZMSObject/input_fields.zpt b/Products/zms/zpt/ZMSObject/input_fields.zpt
index eec556574..aad4d08a9 100644
--- a/Products/zms/zpt/ZMSObject/input_fields.zpt
+++ b/Products/zms/zpt/ZMSObject/input_fields.zpt
@@ -208,12 +208,21 @@
 			<div class="card-body">
 				<div class="form-group row">
 					<div class="controls save">
-						<div class="form-check form-check-inline align-middle" 
-							title="Menu Lock: Stay in the menu after clicking the save button.">
-							<input type="checkbox" id="menulock" name="menulock:int" onclick="$ZMILocalStorageAPI.set('ZMS.menulock',this.checked)" value="1" /><i class="fas fa-lock pl-2"></i>
-						</div>
-						<button type="submit" name="btn" class="btn btn-primary" tal:attributes="value python:'BTN_%s'%command.upper()" tal:content="python:here.getZMILangStr('BTN_%s'%command.upper())">Action</button>
-						<button type="submit" name="btn" class="btn btn-secondary" value="BTN_CANCEL" tal:content="python:here.getZMILangStr('BTN_CANCEL')">Cancel</button>
+						<dialog id="menulock_btn" class="btn" title="Menu Lock: Stay in the menu after clicking the save button." 
+							onclick="$('#menulock').val($('#menulock').val()==0?1:0);$ZMILocalStorageAPI.set('ZMS.menulock',$('#menulock').val())">
+							<input type="hidden" id="menulock" name="menulock:int" value="0" />
+							<i id="menulock_icon" class="fas fa-thumbtack"></i>
+						</dialog>
+						<button type="submit" name="btn" class="btn btn-primary" 
+							tal:attributes="value python:'BTN_%s'%command.upper()" 
+							tal:content="python:here.getZMILangStr('BTN_%s'%command.upper())">
+							Action
+						</button>
+						<button type="submit" name="btn" class="btn btn-secondary" 
+							value="BTN_CANCEL" 
+							tal:content="python:here.getZMILangStr('BTN_CANCEL')">
+							Cancel
+						</button>
 					</div>
 				</div><!-- .form-group -->
 			</div><!-- .card-body -->
diff --git a/Products/zms/zpt/ZMSSqlDb/input_form.zpt b/Products/zms/zpt/ZMSSqlDb/input_form.zpt
index 64cf76e06..cbf4d49fa 100644
--- a/Products/zms/zpt/ZMSSqlDb/input_form.zpt
+++ b/Products/zms/zpt/ZMSSqlDb/input_form.zpt
@@ -216,13 +216,22 @@
 
 			<div class="form-group row">
 				<div class="controls save">
-					<div tal:replace="nothing" 
-						class="form-check form-check-inline align-middle" 
-						title="Menu Lock: Stay in the menu after clicking the save button.">
-						<input type="checkbox" id="menulock" name="menulock:int" onclick="$ZMILocalStorageAPI.set('ZMS.menulock',this.checked)" value="1" /><i class="fas fa-lock pl-2"></i>
-					</div>
-					<button type="submit" name="btn" class="btn btn-primary" value="BTN_SAVE" tal:content="python:here.getZMILangStr('BTN_SAVE')">Save</button>
-					<button type="submit" name="btn" class="btn btn-secondary" value="BTN_CANCEL" tal:content="python:here.getZMILangStr('BTN_CANCEL')">Cancel</button>
+					<dialog tal:replace="nothing"
+						id="menulock_btn" class="btn" title="Menu Lock: Stay in the menu after clicking the save button." 
+						onclick="$('#menulock').val($('#menulock').val()==0?1:0);$ZMILocalStorageAPI.set('ZMS.menulock',$('#menulock').val())">
+						<input type="hidden" id="menulock" name="menulock:int" value="0" />
+						<i id="menulock_icon" class="fas fa-thumbtack"></i>
+					</dialog>
+					<button type="submit" name="btn" class="btn btn-primary" 
+						value="BTN_SAVE" 
+						tal:content="python:here.getZMILangStr('BTN_SAVE')">
+						Save
+					</button>
+					<button type="submit" name="btn" class="btn btn-secondary" 
+						value="BTN_CANCEL" 
+						tal:content="python:here.getZMILangStr('BTN_CANCEL')">
+						Cancel
+					</button>
 				</div>
 			</div><!-- .form-group -->
 
diff --git a/docker/var/Data.fs b/docker/var/Data.fs
index 11da5dd03..a108ea618 100755
Binary files a/docker/var/Data.fs and b/docker/var/Data.fs differ
diff --git a/docker/var/Data.fs.index b/docker/var/Data.fs.index
index 3a4b0fe5f..6504fe575 100755
Binary files a/docker/var/Data.fs.index and b/docker/var/Data.fs.index differ
diff --git a/docker/var/Data.fs.tmp b/docker/var/Data.fs.tmp
index 788eac99c..b64576ad0 100755
Binary files a/docker/var/Data.fs.tmp and b/docker/var/Data.fs.tmp differ