diff --git a/addressbook/templates/default/edit.xet b/addressbook/templates/default/edit.xet
index c5d67c0ff7..5ab08e731d 100644
--- a/addressbook/templates/default/edit.xet
+++ b/addressbook/templates/default/edit.xet
@@ -323,12 +323,12 @@
 	</template>
 	<template id="addressbook.edit.custom" template="" lang="" group="0" version="1.9.001">
 		<box width="100%" overflow="auto">
-			<customfields options="$cont[tid],$cont[no_private_cfs]"/>
+			<customfields options=",$cont[no_private_cfs]" type_filter="$cont[tid]"/>
 		</box>
 	</template>
 	<template id="addressbook.edit.custom_private" template="" lang="" group="0" version="1.9.001">
 		<box width="100%" overflow="auto">
-			<customfields id="private_cfs" options="$cont[tid],1"/>
+			<customfields id="private_cfs" options=",1" type_filter="$cont[tid]"/>
 		</box>
 	</template>
 	<template id="addressbook.edit.history" template="" lang="" group="0" version="1.9.001">
diff --git a/addressbook/templates/mobile/edit.xet b/addressbook/templates/mobile/edit.xet
index b33ce95ca8..ee455c018c 100644
--- a/addressbook/templates/mobile/edit.xet
+++ b/addressbook/templates/mobile/edit.xet
@@ -275,7 +275,7 @@
 			<rows>
 				<row>
 					<box width="100%" overflow="auto">
-						<customfields options="$cont[tid],$cont[no_private_cfs]"/>
+						<customfields options=",$cont[no_private_cfs]" type_filter="$cont[tid]"/>
 					</box>
 				</row>
 			</rows>
@@ -290,7 +290,7 @@
 			<rows>
 				<row>
 					<box width="100%" overflow="auto">
-						<customfields id="private_cfs" options="$cont[tid],1"/>
+						<customfields id="private_cfs" options=",1" type_filter="$cont[tid]"/>
 					</box>
 				</row>
 			</rows>
diff --git a/calendar/templates/mobile/edit.xet b/calendar/templates/mobile/edit.xet
index 1dd939a167..ffb9967172 100644
--- a/calendar/templates/mobile/edit.xet
+++ b/calendar/templates/mobile/edit.xet
@@ -158,19 +158,7 @@
 		</grid>
 	</template>
 	<template id="calendar.edit.custom" template="" lang="" group="0" version="1.4.001">
-		<grid width="100%">
-			<columns>
-				<column width = "120"/>
-				<column/>
-			</columns>
-			<rows>
-				<row>
-					<box width="100%" overflow="auto">
-						<customfields options="@info_type"/>
-					</box>
-				</row>
-			</rows>
-		</grid>
+		<customfields/>
 	</template>
 	<template id="calendar.edit.links" template="" lang="" group="0" version="1.0.1.001">
 		<grid width="100%">
diff --git a/filemanager/templates/mobile/file.xet b/filemanager/templates/mobile/file.xet
index 083d1534cf..68385e7071 100644
--- a/filemanager/templates/mobile/file.xet
+++ b/filemanager/templates/mobile/file.xet
@@ -193,19 +193,7 @@
 		</grid>
 	</template>
 	<template id="filemanager.file.custom" template="" lang="" group="0" version="1.5.001">
-		<grid width="100%">
-			<columns>
-				<column width = "120"/>
-				<column/>
-			</columns>
-			<rows>
-				<row>
-					<box width="100%" overflow="auto">
-						<customfields options="@info_type"/>
-					</box>
-				</row>
-			</rows>
-		</grid>
+		<customfields/>
 	</template>
 	<template id="filemanager.file" template="" lang="" group="0" version="1.9.001">
 		<grid border="1" width="100%">
diff --git a/infolog/templates/mobile/edit.xet b/infolog/templates/mobile/edit.xet
index 56a91d731f..8a14e21827 100644
--- a/infolog/templates/mobile/edit.xet
+++ b/infolog/templates/mobile/edit.xet
@@ -57,19 +57,7 @@
 		</grid>
 	</template>
 	<template id="infolog.edit.customfields" template="" lang="" group="0" version="1.0.1.001">
-		<grid width="100%">
-			<columns>
-				<column width = "120"/>
-				<column/>
-			</columns>
-			<rows>
-				<row>
-					<box width="100%" overflow="auto">
-						<customfields options="@info_type"/>
-					</box>
-				</row>
-			</rows>
-		</grid>
+		<customfields type_filter="@info_type"/>
 	</template>
 	<template id="infolog.edit.details" template="" lang="" group="0" version="1.9.001">
 		<grid width="100%">
diff --git a/infolog/templates/mobile/view.xet b/infolog/templates/mobile/view.xet
index c37dee50de..7c5eb46ec1 100644
--- a/infolog/templates/mobile/view.xet
+++ b/infolog/templates/mobile/view.xet
@@ -54,19 +54,7 @@
 		</grid>
 	</template>
 	<template id="infolog.view.customfields" template="" lang="" group="0" version="1.0.1.001">
-		<grid width="100%">
-			<columns>
-				<column width = "120"/>
-				<column/>
-			</columns>
-			<rows>
-				<row>
-					<box width="100%" overflow="auto">
-						<customfields options="@info_type"/>
-					</box>
-				</row>
-			</rows>
-		</grid>
+		<customfields type_filter="@info_type"/>
 	</template>
 	<template id="infolog.view.details" template="" lang="" group="0" version="1.9.001">
 		<grid width="100%">
diff --git a/timesheet/templates/mobile/edit.xet b/timesheet/templates/mobile/edit.xet
index a3397ecddc..a2739fcacc 100644
--- a/timesheet/templates/mobile/edit.xet
+++ b/timesheet/templates/mobile/edit.xet
@@ -64,19 +64,7 @@
 		</grid>
 	</template>
 	<template id="timesheet.edit.customfields" template="" lang="" group="0" version="1.5.001">
-		<grid width="100%">
-			<columns>
-				<column width = "120"/>
-				<column/>
-			</columns>
-			<rows>
-				<row>
-					<box width="100%" overflow="auto">
-						<customfields options="@info_type"/>
-					</box>
-				</row>
-			</rows>
-		</grid>
+		<customfields/>
 	</template>
 	<template id="timesheet.edit.ownership" template="" lang="" group="0" version="16.1.00">
 		<grid width="100%">
diff --git a/timesheet/templates/mobile/view.xet b/timesheet/templates/mobile/view.xet
index 82902855e0..8c6f63783b 100644
--- a/timesheet/templates/mobile/view.xet
+++ b/timesheet/templates/mobile/view.xet
@@ -46,19 +46,7 @@
 		<textbox multiline="true" id="ts_description" rows="9" cols="70" class="et2_fullWidth"  height="250" resize_ratio="0"/>
 	</template>
 	<template id="timesheet.view.customfields" template="" lang="" group="0" version="1.5.001">
-		<grid width="100%">
-			<columns>
-				<column width = "120"/>
-				<column/>
-			</columns>
-			<rows>
-				<row>
-					<box width="100%" overflow="auto">
-						<customfields options="@info_type"/>
-					</box>
-				</row>
-			</rows>
-		</grid>
+		<customfields options="@info_type"/>
 	</template>
 	<template id="timesheet.view.ownership" template="" lang="" group="0" version="16.1.00">
 		<grid width="100%">