diff --git a/layouts/v7/modules/Inventory/partials/LineItemsEdit.tpl b/layouts/v7/modules/Inventory/partials/LineItemsEdit.tpl
index 774a89b6286ccb45bcabb0bf7d2481d7b7f9a13a..ae916ee3259514bb56735227698b2bc7d639fa41 100644
--- a/layouts/v7/modules/Inventory/partials/LineItemsEdit.tpl
+++ b/layouts/v7/modules/Inventory/partials/LineItemsEdit.tpl
@@ -63,8 +63,6 @@
 	{assign var="IS_INDIVIDUAL_TAX_TYPE" value=true}
 {/if}
 
-<input type="hidden" id="customFields" value='{Zend_Json::encode($CUSTOM_FIELDS)}'>
-<input type="hidden" id="customFieldsDefaultValues" value='{Zend_Json::encode($CUSTOM_FIELDS_DEFAULT_VALUES)}'>
 <input type="hidden" class="numberOfCurrencyDecimal" value="{$USER_MODEL->get('no_of_currency_decimals')}" />
 <input type="hidden" name="totalProductCount" id="totalProductCount" value="{$row_no}" />
 <input type="hidden" name="subtotal" id="subtotal" value="" />
diff --git a/layouts/v7/modules/Vtiger/dashboards/MiniListWizard.tpl b/layouts/v7/modules/Vtiger/dashboards/MiniListWizard.tpl
index 8c50ab19ee3fbec2f37055befc2818399caf1d36..9391882549c4a68745ce84fd7474a943d3f55cf9 100644
--- a/layouts/v7/modules/Vtiger/dashboards/MiniListWizard.tpl
+++ b/layouts/v7/modules/Vtiger/dashboards/MiniListWizard.tpl
@@ -54,7 +54,7 @@
 							<td class="col-lg-4"></td>
 						</tr>
 				   </tbody>
-				   <input type="hidden" id="translatedModuleNames" value='{ZEND_JSON::encode($TRANSLATED_MODULE_NAMES)}'>
+				   <input type="hidden" id="translatedModuleNames" value='{Vtiger_Util_Helper::toSafeHTML(ZEND_JSON::encode($TRANSLATED_MODULE_NAMES))}'>
 				</table>
 				{include file='ModalFooter.tpl'|@vtemplate_path:$MODULE}
 			</form>