diff --git a/extension/iframe/create.tsx b/extension/iframe/create.tsx
index 2beae6c37a..943dea8839 100644
--- a/extension/iframe/create.tsx
+++ b/extension/iframe/create.tsx
@@ -153,7 +153,7 @@ const Create = observer(class Create extends React.Component<I.PageComponent, St
 		const node = $(this.node);
 		const filters: I.Filter[] = [
 			{ relationKey: 'resolvedLayout', condition: I.FilterCondition.In, value: U.Object.getPageLayouts() },
-			{ relationKey: 'type.uniqueKey', condition: I.FilterCondition.NotEqual, value: J.Constant.typeKey.template },
+			{ relationKey: 'type.uniqueKey', condition: I.FilterCondition.NotIn, value: [ J.Constant.typeKey.template ] }
 		];
 
 		S.Menu.open('searchObject', {
diff --git a/src/ts/component/block/featured.tsx b/src/ts/component/block/featured.tsx
index 51b064e546..6832a7cf80 100644
--- a/src/ts/component/block/featured.tsx
+++ b/src/ts/component/block/featured.tsx
@@ -461,7 +461,7 @@ const BlockFeatured = observer(class BlockFeatured extends React.Component<Props
 					filter: '',
 					filters: [
 						{ relationKey: 'recommendedLayout', condition: I.FilterCondition.In, value: U.Object.getPageLayouts() },
-						{ relationKey: 'uniqueKey', condition: I.FilterCondition.NotEqual, value: J.Constant.typeKey.template },
+						{ relationKey: 'uniqueKey', condition: I.FilterCondition.NotIn, value: [ J.Constant.typeKey.template, J.Constant.typeKey.type ] }
 					],
 					keys: U.Data.typeRelationKeys(),
 					skipIds: [ object.type ],
diff --git a/src/ts/component/header/main/object.tsx b/src/ts/component/header/main/object.tsx
index 433b06c7ec..eab881f706 100644
--- a/src/ts/component/header/main/object.tsx
+++ b/src/ts/component/header/main/object.tsx
@@ -53,7 +53,7 @@ const HeaderMainObject = observer(forwardRef<{}, I.HeaderComponent>((props, ref)
 					onMouseOut={onTooltipHide}
 				>
 					<IconObject object={object} size={18} />
-					<ObjectName object={object} />
+					<ObjectName object={object} withPlural={true} />
 					{label ? <Label text={label} /> : ''}
 				</div>
 			);
diff --git a/src/ts/component/menu/block/action.tsx b/src/ts/component/menu/block/action.tsx
index 68bbd5dc25..776736a376 100644
--- a/src/ts/component/menu/block/action.tsx
+++ b/src/ts/component/menu/block/action.tsx
@@ -418,7 +418,7 @@ class MenuBlockAction extends React.Component<I.Menu, State> {
 					filter: '',
 					filters: [
 						{ relationKey: 'recommendedLayout', condition: I.FilterCondition.In, value: U.Object.getPageLayouts() },
-						{ relationKey: 'uniqueKey', condition: I.FilterCondition.NotEqual, value: J.Constant.typeKey.template },
+						{ relationKey: 'uniqueKey', condition: I.FilterCondition.NotIn, value: [ J.Constant.typeKey.template, J.Constant.typeKey.type ] }
 					],
 					onClick: (item: any) => {
 						this.moveToPage(item.id);
diff --git a/src/ts/component/menu/dataview/new.tsx b/src/ts/component/menu/dataview/new.tsx
index 635a2fae5e..aba93b51d5 100644
--- a/src/ts/component/menu/dataview/new.tsx
+++ b/src/ts/component/menu/dataview/new.tsx
@@ -102,8 +102,9 @@ const MenuNew = observer(forwardRef<I.MenuRef, I.Menu>((props, ref) => {
 			case 'existing': {
 				menuId = 'searchObject';
 				menuParam.data = Object.assign(menuParam.data, {
+					withPlural: true,
 					filters: [
-						{ relationKey: 'resolvedLayout', condition: I.FilterCondition.NotIn, value: U.Object.getSystemLayouts() },
+						{ relationKey: 'resolvedLayout', condition: I.FilterCondition.NotIn, value: U.Object.getLayoutsForTypeSelection() },
 						{ relationKey: 'isReadonly', condition: I.FilterCondition.NotEqual, value: true },
 					],
 					onSelect: (el: any) => {
diff --git a/src/ts/lib/util/data.ts b/src/ts/lib/util/data.ts
index 1738269c94..3c3d811ecf 100644
--- a/src/ts/lib/util/data.ts
+++ b/src/ts/lib/util/data.ts
@@ -1036,7 +1036,7 @@ class UtilData {
 			{ relationKey: 'isDeleted', condition: I.FilterCondition.NotEqual, value: true },
 			{ relationKey: 'resolvedLayout', condition: I.FilterCondition.NotIn, value: U.Object.getGraphSkipLayouts() },
 			{ relationKey: 'id', condition: I.FilterCondition.NotEqual, value: J.Constant.anytypeProfileId },
-			{ relationKey: 'type.uniqueKey', condition: I.FilterCondition.NotEqual, value: J.Constant.typeKey.template }
+			{ relationKey: 'type.uniqueKey', condition: I.FilterCondition.NotIn, value: [ J.Constant.typeKey.template ] }
 		];
 	};