diff --git a/packages/core/client/src/collection-manager/interfaces/checkbox.ts b/packages/core/client/src/collection-manager/interfaces/checkbox.ts
index a3c56fd64c..1bfa73ba8b 100644
--- a/packages/core/client/src/collection-manager/interfaces/checkbox.ts
+++ b/packages/core/client/src/collection-manager/interfaces/checkbox.ts
@@ -17,7 +17,7 @@ export const checkbox: IField = {
       'x-component': 'Checkbox',
     },
   },
-  availableTypes: ['boolean'],
+  availableTypes: ['boolean', 'integer', 'bigInt'],
   hasDefaultValue: true,
   properties: {
     ...defaultProps,
diff --git a/packages/core/client/src/collection-manager/interfaces/datetime.ts b/packages/core/client/src/collection-manager/interfaces/datetime.ts
index 935259cf0c..a2ec5f4c56 100644
--- a/packages/core/client/src/collection-manager/interfaces/datetime.ts
+++ b/packages/core/client/src/collection-manager/interfaces/datetime.ts
@@ -21,7 +21,7 @@ export const datetime: IField = {
       },
     },
   },
-  availableTypes: ['date'],
+  availableTypes: ['date', 'dateOnly'],
   hasDefaultValue: true,
   properties: {
     ...defaultProps,
diff --git a/packages/core/client/src/collection-manager/interfaces/json.tsx b/packages/core/client/src/collection-manager/interfaces/json.tsx
index 3637961eae..2ce3d490bc 100644
--- a/packages/core/client/src/collection-manager/interfaces/json.tsx
+++ b/packages/core/client/src/collection-manager/interfaces/json.tsx
@@ -42,7 +42,7 @@ export const json: IField = {
       default: null,
     },
   },
-  availableTypes: ['json', 'array', 'jsonb'],
+  availableTypes: ['json', 'array', 'jsonb', 'text', 'circle', 'lineString', 'point', 'polygon'],
   hasDefaultValue: true,
   properties: {
     ...defaultProps,
diff --git a/packages/core/client/src/collection-manager/interfaces/markdown.ts b/packages/core/client/src/collection-manager/interfaces/markdown.ts
index 5430c67c18..b4b8360841 100644
--- a/packages/core/client/src/collection-manager/interfaces/markdown.ts
+++ b/packages/core/client/src/collection-manager/interfaces/markdown.ts
@@ -18,7 +18,7 @@ export const markdown: IField = {
       'x-component': 'Markdown',
     },
   },
-  availableTypes: ['text'],
+  availableTypes: ['text', 'json'],
   hasDefaultValue: true,
   properties: {
     ...defaultProps,
diff --git a/packages/core/client/src/collection-manager/interfaces/number.ts b/packages/core/client/src/collection-manager/interfaces/number.ts
index 30a19ef420..1b401939b9 100644
--- a/packages/core/client/src/collection-manager/interfaces/number.ts
+++ b/packages/core/client/src/collection-manager/interfaces/number.ts
@@ -23,7 +23,7 @@ export const number: IField = {
       },
     },
   },
-  availableTypes: ['double', 'float'],
+  availableTypes: ['double', 'float', 'decimal'],
   hasDefaultValue: true,
   properties: {
     ...defaultProps,
diff --git a/packages/core/client/src/collection-manager/interfaces/o2o.tsx b/packages/core/client/src/collection-manager/interfaces/o2o.tsx
index 7363d85654..3f424abc8e 100644
--- a/packages/core/client/src/collection-manager/interfaces/o2o.tsx
+++ b/packages/core/client/src/collection-manager/interfaces/o2o.tsx
@@ -189,6 +189,7 @@ export const oho: IField = {
   title: '{{t("One to one (has one)")}}',
   description: '{{t("One to one description")}}',
   isAssociation: true,
+  availableTypes: ['hasOne'],
   default: {
     type: 'hasOne',
     // name,
@@ -392,6 +393,7 @@ export const obo: IField = {
       },
     },
   },
+  availableTypes: ['belongsTo'],
   schemaInitialize(schema: ISchema, { field, block, readPretty, action, targetCollection }) {
     // schema['type'] = 'object';
     if (['Table', 'Kanban'].includes(block)) {
diff --git a/packages/core/client/src/collection-manager/interfaces/percent.ts b/packages/core/client/src/collection-manager/interfaces/percent.ts
index dd3ebc3a34..887cf7ce4b 100644
--- a/packages/core/client/src/collection-manager/interfaces/percent.ts
+++ b/packages/core/client/src/collection-manager/interfaces/percent.ts
@@ -76,7 +76,7 @@ export const percent: IField = {
       width: '100%',
     };
   },
-  availableTypes: ['float'],
+  availableTypes: ['float', 'double', 'decimal'],
   hasDefaultValue: true,
   properties: {
     ...defaultProps,
diff --git a/packages/core/client/src/collection-manager/interfaces/radioGroup.ts b/packages/core/client/src/collection-manager/interfaces/radioGroup.ts
index 8fdf5e331a..9bde4266ff 100644
--- a/packages/core/client/src/collection-manager/interfaces/radioGroup.ts
+++ b/packages/core/client/src/collection-manager/interfaces/radioGroup.ts
@@ -18,7 +18,7 @@ export const radioGroup: IField = {
       'x-component': 'Radio.Group',
     },
   },
-  availableTypes: ['string'],
+  availableTypes: ['string', 'integer', 'boolean', 'integer'],
   hasDefaultValue: true,
   properties: {
     ...defaultProps,
diff --git a/packages/core/client/src/collection-manager/interfaces/richText.ts b/packages/core/client/src/collection-manager/interfaces/richText.ts
index deb0bb4ed3..c144017126 100644
--- a/packages/core/client/src/collection-manager/interfaces/richText.ts
+++ b/packages/core/client/src/collection-manager/interfaces/richText.ts
@@ -19,7 +19,7 @@ export const richText: IField = {
       'x-component': 'RichText',
     },
   },
-  availableTypes: ['text'],
+  availableTypes: ['text', 'json'],
   hasDefaultValue: true,
   properties: {
     ...defaultProps,
diff --git a/packages/core/client/src/collection-manager/interfaces/select.ts b/packages/core/client/src/collection-manager/interfaces/select.ts
index bdf79a49bb..3e067763f0 100644
--- a/packages/core/client/src/collection-manager/interfaces/select.ts
+++ b/packages/core/client/src/collection-manager/interfaces/select.ts
@@ -20,7 +20,7 @@ export const select: IField = {
       enum: [],
     },
   },
-  availableTypes: ['string'],
+  availableTypes: ['string', 'bigInt', 'boolean'],
   hasDefaultValue: true,
   properties: {
     ...defaultProps,
diff --git a/packages/core/client/src/collection-manager/interfaces/textarea.ts b/packages/core/client/src/collection-manager/interfaces/textarea.ts
index 5cf4d5779d..69e618870e 100644
--- a/packages/core/client/src/collection-manager/interfaces/textarea.ts
+++ b/packages/core/client/src/collection-manager/interfaces/textarea.ts
@@ -19,7 +19,7 @@ export const textarea: IField = {
       'x-component': 'Input.TextArea',
     },
   },
-  availableTypes: ['text'],
+  availableTypes: ['text', 'json'],
   hasDefaultValue: true,
   properties: {
     ...defaultProps,