diff --git a/frontend/src/Editor/CodeEditor/CodeHinter.jsx b/frontend/src/Editor/CodeEditor/CodeHinter.jsx
index 39d615384c..f7835d82ab 100644
--- a/frontend/src/Editor/CodeEditor/CodeHinter.jsx
+++ b/frontend/src/Editor/CodeEditor/CodeHinter.jsx
@@ -15,6 +15,7 @@ const CODE_EDITOR_TYPE = {
   fxEditor: SingleLineCodeEditor.EditorBridge,
   basic: SingleLineCodeEditor,
   multiline: MultiLineCodeEditor,
+  extendedSingleLine: SingleLineCodeEditor,
 };
 
 const CodeHinter = ({ type = 'basic', initialValue, componentName, ...restProps }) => {
diff --git a/frontend/src/Editor/CodeEditor/MultiLineCodeEditor.jsx b/frontend/src/Editor/CodeEditor/MultiLineCodeEditor.jsx
index 4ba6fb0cab..223c7f2a7b 100644
--- a/frontend/src/Editor/CodeEditor/MultiLineCodeEditor.jsx
+++ b/frontend/src/Editor/CodeEditor/MultiLineCodeEditor.jsx
@@ -14,6 +14,7 @@ import ErrorBoundary from '../ErrorBoundary';
 import CodeHinter from './CodeHinter';
 import { CodeHinterContext } from '../CodeBuilder/CodeHinterContext';
 import { createReferencesLookup } from '@/_stores/utils';
+import { PreviewBox } from './PreviewBox';
 
 const langSupport = Object.freeze({
   javascript: javascript(),
@@ -37,6 +38,7 @@ const MultiLineCodeEditor = (props) => {
     hideSuggestion,
     suggestions: hints,
     portalProps,
+    showPreview,
   } = props;
 
   const [currentValue, setCurrentValue] = React.useState(() => initialValue);
@@ -86,6 +88,16 @@ const MultiLineCodeEditor = (props) => {
   };
 
   function autoCompleteExtensionConfig(context) {
+    const lastTypedWord = context.state.doc.text.map((element) => element.trim()).join(' ')[context.pos - 1];
+
+    const lastWordRegex = /([.\w]+)$/;
+
+    let lastWord = lastTypedWord ? lastWordRegex.exec(context.state.doc.text) : '';
+
+    if (lastWord === null) {
+      lastWord = [''];
+    }
+
     const lasttWord = context.state.doc.text
       .map((element) => element.trim())
       .join(' ')
@@ -122,9 +134,9 @@ const MultiLineCodeEditor = (props) => {
     const appHints = hints['appHints'];
 
     let autoSuggestionList = appHints.filter((suggestion) => {
-      if (currentWord.length === 0) return true;
+      const find = lastWord[0] || lastWord[1] || '';
 
-      return suggestion.hint.includes(currentWord);
+      return suggestion.hint.includes(find);
     });
 
     const suggestions = generateHints([...JSLangHints, ...autoSuggestionList, ...suggestionList]).map((hint) => {
@@ -227,6 +239,17 @@ const MultiLineCodeEditor = (props) => {
                 indentWithTab={true}
               />
             </div>
+            {showPreview && (
+              <div className="multiline-previewbox-wrapper">
+                <PreviewBox
+                  currentValue={currentValue}
+                  validationSchema={null}
+                  setErrorStateActive={() => null}
+                  componentId={null}
+                  setErrorMessage={() => null}
+                />
+              </div>
+            )}
           </ErrorBoundary>
         </CodeHinter.Portal>
       </div>
diff --git a/frontend/src/Editor/CodeEditor/PreviewBox.jsx b/frontend/src/Editor/CodeEditor/PreviewBox.jsx
index 436c152ec1..4332c6e3de 100644
--- a/frontend/src/Editor/CodeEditor/PreviewBox.jsx
+++ b/frontend/src/Editor/CodeEditor/PreviewBox.jsx
@@ -116,7 +116,11 @@ export const PreviewBox = ({ currentValue, validationSchema, setErrorStateActive
         coersionData={coersionData}
         withValidation={!isEmpty(validationSchema)}
       />
-      <CodeHinter.PopupIcon callback={() => copyToClipboard(content)} icon={'copy'} tip={'Copy to clipboard'} />
+      <CodeHinter.PopupIcon
+        callback={() => copyToClipboard(error ? error?.value : content)}
+        icon={'copy'}
+        tip={'Copy to clipboard'}
+      />
     </>
   );
 };
@@ -351,7 +355,7 @@ const PreviewCodeBlock = ({ code, isExpectValue = false }) => {
           padding: '0',
         }}
       >
-        {prettyPrintedJson?.startsWith('{{')
+        {prettyPrintedJson?.startsWith('{{') && prettyPrintedJson?.endsWith('{{')
           ? prettyPrintedJson?.replace(/{{/g, '').replace(/}}/g, '')
           : prettyPrintedJson}
       </pre>
diff --git a/frontend/src/Editor/CodeEditor/SingleLineCodeEditor.jsx b/frontend/src/Editor/CodeEditor/SingleLineCodeEditor.jsx
index cb834b0498..6adc1beda2 100644
--- a/frontend/src/Editor/CodeEditor/SingleLineCodeEditor.jsx
+++ b/frontend/src/Editor/CodeEditor/SingleLineCodeEditor.jsx
@@ -19,7 +19,7 @@ import { getAutocompletion } from './autocompleteExtensionConfig';
 import ErrorBoundary from '../ErrorBoundary';
 import CodeHinter from './CodeHinter';
 
-const SingleLineCodeEditor = ({ suggestions, componentName, fieldMeta = {}, fxActive, ...restProps }) => {
+const SingleLineCodeEditor = ({ suggestions, componentName, fieldMeta = {}, ...restProps }) => {
   const { initialValue, onChange, enablePreview = true, portalProps } = restProps;
   const { validation = {} } = fieldMeta;
 
@@ -40,7 +40,7 @@ const SingleLineCodeEditor = ({ suggestions, componentName, fieldMeta = {}, fxAc
 
   useEffect(() => {
     const handleClickOutside = (event) => {
-      if (cursorInsidePreview || portalProps?.isOpen) {
+      if (cursorInsidePreview || portalProps?.isOpen || event.target.closest('.cm-tooltip-autocomplete')) {
         return;
       }
 
@@ -120,6 +120,8 @@ const EditorInput = ({
   lang,
   isFocused,
   componentId,
+  type,
+  className,
 }) => {
   function autoCompleteExtensionConfig(context) {
     let word = context.matchBefore(/\w*/);
@@ -128,7 +130,7 @@ const EditorInput = ({
 
     let queryInput = context.state.doc.toString();
 
-    if (totalReferences > 1) {
+    if (totalReferences > 0) {
       const currentWord = queryInput.split('{{').pop().split('}}')[0];
       queryInput = '{{' + currentWord + '}}';
     }
@@ -160,7 +162,8 @@ const EditorInput = ({
     setCurrentValue(val);
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
-  const handleOnBlur = React.useCallback(() => {
+
+  const handleOnBlur = () => {
     setFirstTimeFocus(false);
     if (ignoreValidation) {
       return onBlurUpdate(currentValue);
@@ -171,8 +174,7 @@ const EditorInput = ({
         onBlurUpdate(_value);
       }
     }, 0);
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [currentValue, error]);
+  };
 
   const darkMode = localStorage.getItem('darkMode') === 'true';
   const theme = darkMode ? okaidia : githubLight;
@@ -197,6 +199,8 @@ const EditorInput = ({
     }, 50);
   };
 
+  const showLineNumbers = lang == 'jsx' || type === 'extendedSingleLine' || false;
+
   return (
     <div
       ref={currentEditorHeightRef}
@@ -229,7 +233,7 @@ const EditorInput = ({
           <CodeMirror
             value={currentValue}
             placeholder={placeholder}
-            height={lang === 'jsx' ? '400px' : '100%'}
+            height={showLineNumbers ? '400px' : '100%'}
             width="100%"
             extensions={[javascript({ jsx: lang === 'jsx' }), autoCompleteConfig, keymap.of([...customKeyMaps])]}
             onChange={(val) => {
@@ -237,7 +241,7 @@ const EditorInput = ({
               handleOnChange(val);
             }}
             basicSetup={{
-              lineNumbers: lang === 'jsx',
+              lineNumbers: showLineNumbers,
               syntaxHighlighting: true,
               bracketMatching: true,
               foldGutter: false,
diff --git a/frontend/src/Editor/CodeEditor/autocompleteExtensionConfig.js b/frontend/src/Editor/CodeEditor/autocompleteExtensionConfig.js
index a85238987c..5fd12a6ca3 100644
--- a/frontend/src/Editor/CodeEditor/autocompleteExtensionConfig.js
+++ b/frontend/src/Editor/CodeEditor/autocompleteExtensionConfig.js
@@ -96,7 +96,7 @@ export const generateHints = (hints, totalReferences = 1) => {
           pickedCompletionConfig.from = from;
         }
 
-        if (totalReferences > 1 && completion.type !== 'js_methods') {
+        if (totalReferences > 0 && completion.type !== 'js_methods') {
           let queryInput = view.state.doc.toString();
           const currentWord = queryInput.split('{{').pop().split('}}')[0];
           pickedCompletionConfig.from = from !== to ? from : from - currentWord.length;
diff --git a/frontend/src/Editor/CodeEditor/styles.scss b/frontend/src/Editor/CodeEditor/styles.scss
index a5dd955ec0..a5aa3e5637 100644
--- a/frontend/src/Editor/CodeEditor/styles.scss
+++ b/frontend/src/Editor/CodeEditor/styles.scss
@@ -38,7 +38,6 @@
     border: 1px solid var(--Border-week, #E4E7EB) !important;
     border-radius: 6px !important;
     box-shadow: 0px 4px 8px 0px rgba(48, 49, 51, 0.10), 0px 0px 1px 0px rgba(48, 49, 51, 0.05);
-    position: absolute !important;
     z-index: 99999 !important;
     overflow-y: auto !important;
     overflow-x: hidden !important;
@@ -209,8 +208,7 @@
 
     .cm-tooltip-autocomplete {
         @extend .cm-base-autocomplete;
-        left: 0 !important;
-        top: 35px !important;
+        margin-top: 13px;
     }
 
     .cm-editor {
@@ -352,4 +350,24 @@
     .codehinter-input .cm-editor {
         max-height: auto !important;
     }
-}
\ No newline at end of file
+}
+
+// remove if multiline codehinter is moved to side
+// .multiline-previewbox-wrapper {
+//     box-shadow: 0px 4px 8px 0px #3032331A;
+//     border: 1px solid var(--borders-disabled-on-white, #E4E7EB);
+//     background: #FFFFFF;
+//     width: Fixed (548px)px;
+//     border-radius: 8px;
+//     max-height: 300px;
+//     overflow-y: auto;
+//     position: relative;
+// }
+
+// .dark-theme,
+// .theme-dark {
+//     .multiline-previewbox-wrapper {
+//         background: #1E2226;
+//         border: 1px solid rgba(43, 48, 54, 20%);
+//     }
+// }
\ No newline at end of file
diff --git a/frontend/src/Editor/Components/Table/Table.jsx b/frontend/src/Editor/Components/Table/Table.jsx
index 42604a0926..1ea5b3195a 100644
--- a/frontend/src/Editor/Components/Table/Table.jsx
+++ b/frontend/src/Editor/Components/Table/Table.jsx
@@ -634,7 +634,7 @@ export function Table({
       columns,
       data,
       defaultColumn,
-      initialState: { pageIndex: 0, pageSize: -1 },
+      initialState: { pageIndex: 0, pageSize: 1 },
       pageCount: -1,
       manualPagination: false,
       getExportFileBlob,
diff --git a/frontend/src/Editor/Editor.jsx b/frontend/src/Editor/Editor.jsx
index d6381cd802..2dbbd42d3f 100644
--- a/frontend/src/Editor/Editor.jsx
+++ b/frontend/src/Editor/Editor.jsx
@@ -368,6 +368,14 @@ const EditorComponent = (props) => {
     }
   }, [currentLayout, mounted]);
 
+  const handleYmapEventUpdates = () => {
+    props.ymap?.set('eventHandlersUpdated', {
+      currentVersionId: currentVersionId,
+      currentSessionId: currentSessionId,
+      update: true,
+    });
+  };
+
   const handleMessage = (event) => {
     const { data } = event;
 
@@ -1950,7 +1958,7 @@ const EditorComponent = (props) => {
           darkMode={props.darkMode}
         />
         {isVersionReleased && <ReleasedVersionError />}
-        <EditorContextWrapper>
+        <EditorContextWrapper handleYmapEventUpdates={handleYmapEventUpdates}>
           <EditorHeader
             darkMode={props.darkMode}
             appDefinition={JSON.parse(JSON.stringify(appDefinition))}
diff --git a/frontend/src/Editor/QueryManager/Components/ParameterDetails.jsx b/frontend/src/Editor/QueryManager/Components/ParameterDetails.jsx
index a92919eaca..3654b3bed6 100644
--- a/frontend/src/Editor/QueryManager/Components/ParameterDetails.jsx
+++ b/frontend/src/Editor/QueryManager/Components/ParameterDetails.jsx
@@ -3,7 +3,6 @@ import { Button, ButtonGroup, OverlayTrigger, Popover } from 'react-bootstrap';
 import cx from 'classnames';
 import PlusRectangle from '@/_ui/Icon/solidIcons/PlusRectangle';
 import Remove from '@/_ui/Icon/bulkIcons/Remove';
-import { ButtonSolid } from '@/_ui/AppButton/AppButton';
 import ParameterForm from './ParameterForm';
 
 const ParameterDetails = ({ darkMode, onSubmit, isEdit, name, defaultValue, onRemove, currentState, otherParams }) => {
@@ -13,9 +12,11 @@ const ParameterDetails = ({ darkMode, onSubmit, isEdit, name, defaultValue, onRe
   useEffect(() => {
     const handleClickOutside = (event) => {
       const isClickedOnAddButton = !!event.target.closest('#runjs-param-add-btn');
+      const isClickedOnPillButton = !!event.target.closest('.parameterItemPillButton');
       if (isClickedOnAddButton && !isEdit) {
-        //if the user is in edit mode add button should close other popups open.
-        //modal closing on this even will be taken care by onClick attached to trigger button
+        return;
+      }
+      if (isClickedOnPillButton) {
         return;
       }
       if (
@@ -36,7 +37,7 @@ const ParameterDetails = ({ darkMode, onSubmit, isEdit, name, defaultValue, onRe
       document.removeEventListener('click', handleClickOutside);
     };
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [showModal]);
+  }, [showModal]); // Include isEdit in the dependency array
 
   const handleSubmit = (param) => {
     if (param.name) {
@@ -47,8 +48,8 @@ const ParameterDetails = ({ darkMode, onSubmit, isEdit, name, defaultValue, onRe
 
   return (
     <OverlayTrigger
-      trigger={'click'}
-      placement={'bottom-end'}
+      trigger="click"
+      placement="bottom-end"
       rootClose={true}
       container={document.getElementsByClassName('query-details ')[0]}
       show={showModal}
@@ -84,7 +85,7 @@ const ParameterDetails = ({ darkMode, onSubmit, isEdit, name, defaultValue, onRe
             onClick={() => setShowModal((show) => !show)}
             className="ms-2"
             id="runjs-param-add-btn"
-            data-cy={`runjs-add-param-button`}
+            data-cy="runjs-add-param-button"
             style={{ background: 'none' }}
           >
             <span className="m-0">
diff --git a/frontend/src/Editor/QueryManager/Components/ParameterForm.jsx b/frontend/src/Editor/QueryManager/Components/ParameterForm.jsx
index 704e08d983..2b11afa421 100644
--- a/frontend/src/Editor/QueryManager/Components/ParameterForm.jsx
+++ b/frontend/src/Editor/QueryManager/Components/ParameterForm.jsx
@@ -1,5 +1,5 @@
-import React, { useEffect, useRef, useState } from 'react';
-import { Form, Popover, Row, Col, OverlayTrigger, Tooltip } from 'react-bootstrap';
+import React, { useEffect, useState } from 'react';
+import { Form, Popover, Col, OverlayTrigger, Tooltip } from 'react-bootstrap';
 import Information from '@/_ui/Icon/solidIcons/Information';
 import CodeHinter from '@/Editor/CodeEditor';
 
@@ -109,7 +109,6 @@ const ParameterForm = ({
                     usePortalEditor={false}
                     style={{ height: '32px', width: '177px', marginBotto: '16px' }}
                     initialValue={defaultValue}
-                    enablePreview={false}
                   />
                 </div>
               </div>
diff --git a/frontend/src/Editor/QueryManager/QueryEditors/Restapi/TabContent.jsx b/frontend/src/Editor/QueryManager/QueryEditors/Restapi/TabContent.jsx
index bde2a07ed9..88cb905ce3 100644
--- a/frontend/src/Editor/QueryManager/QueryEditors/Restapi/TabContent.jsx
+++ b/frontend/src/Editor/QueryManager/QueryEditors/Restapi/TabContent.jsx
@@ -66,7 +66,7 @@ export default ({
       {bodyToggle ? (
         <div>
           <CodeHinter
-            type="multiline"
+            type="extendedSingleLine"
             initialValue={jsonBody ?? ''}
             lang="javascript"
             height={'300px'}
diff --git a/frontend/src/_components/DynamicForm.jsx b/frontend/src/_components/DynamicForm.jsx
index 4b05f96158..60f40f1274 100644
--- a/frontend/src/_components/DynamicForm.jsx
+++ b/frontend/src/_components/DynamicForm.jsx
@@ -183,6 +183,7 @@ const DynamicForm = ({
     className,
     controller,
     encrypted,
+    editorType = 'basic',
   }) => {
     const source = schema?.source?.kind;
     const darkMode = localStorage.getItem('darkMode') === 'true';
@@ -310,7 +311,7 @@ const DynamicForm = ({
         };
       case 'codehinter':
         return {
-          type: height.split('px')[0] > 100 ? 'multiline' : 'basic',
+          type: editorType,
           currentState,
           initialValue: options[key]
             ? typeof options[key] === 'string'
diff --git a/marketplace/plugins/aws-lambda/lib/operations.json b/marketplace/plugins/aws-lambda/lib/operations.json
index 67dfb51238..f03d3c07bd 100644
--- a/marketplace/plugins/aws-lambda/lib/operations.json
+++ b/marketplace/plugins/aws-lambda/lib/operations.json
@@ -33,7 +33,8 @@
         "description": "JSON payload to send to the Lambda function",
         "className": "codehinter-plugins",
         "placeholder": "{\"key\": \"value\"}",
-        "height": "150px"
+        "height": "150px",
+        "editorType": "extendedSingleLine"
       }
     }
   }
diff --git a/marketplace/plugins/awsredshift/lib/operations.json b/marketplace/plugins/awsredshift/lib/operations.json
index 8ae58f11aa..cc8ed9e6f5 100644
--- a/marketplace/plugins/awsredshift/lib/operations.json
+++ b/marketplace/plugins/awsredshift/lib/operations.json
@@ -24,8 +24,9 @@
         "key": "sql_query",
         "type": "codehinter",
         "description": "Enter your SQL query",
-        "height": "150px"
+        "height": "150px",
+        "editorType": "extendedSingleLine"
       }
     }
   }
-}
+}
\ No newline at end of file
diff --git a/marketplace/plugins/harperdb/lib/operations.json b/marketplace/plugins/harperdb/lib/operations.json
index 6ebd3d08d0..fd621da045 100644
--- a/marketplace/plugins/harperdb/lib/operations.json
+++ b/marketplace/plugins/harperdb/lib/operations.json
@@ -28,7 +28,8 @@
         "key": "sql_query",
         "type": "codehinter",
         "description": "Enter your SQL query",
-        "height": "150px"
+        "height": "150px",
+        "editorType": "extendedSingleLine"
       }
     },
     "nosql": {
@@ -90,7 +91,8 @@
           "mode": "javascript",
           "description": "Enter records to insert",
           "placeholder": "[{id: 1, name: 'Jose', age: 24}]",
-          "height": "150px"
+          "height": "150px",
+          "editorType": "extendedSingleLine"
         }
       },
       "update": {
@@ -119,7 +121,8 @@
           "mode": "javascript",
           "description": "Enter records to update",
           "placeholder": "[{id: 1, age: 25}]",
-          "height": "150px"
+          "height": "150px",
+          "editorType": "extendedSingleLine"
         }
       },
       "delete": {
@@ -148,7 +151,8 @@
           "mode": "javascript",
           "description": "Enter hash attribute - primary key to delete records",
           "placeholder": "[123, 65]",
-          "height": "150px"
+          "height": "150px",
+          "editorType": "extendedSingleLine"
         }
       },
       "search_by_hash": {
@@ -305,6 +309,7 @@
           "mode": "javascript",
           "description": "Enter Conditions to Filter",
           "height": "150px",
+          "editorType": "extendedSingleLine",
           "placeholder": "[{'search_attribute': 'age', 'search_type': 'between', 'search_value': [25, 29]}, {'search_attribute': 'weight_lbs', 'search_type': 'greater_than', 'search_value': 40}]"
         }
       }
diff --git a/marketplace/plugins/openai/lib/operations.json b/marketplace/plugins/openai/lib/operations.json
index 2f4775fbce..61f295f634 100644
--- a/marketplace/plugins/openai/lib/operations.json
+++ b/marketplace/plugins/openai/lib/operations.json
@@ -27,7 +27,8 @@
         "key": "prompt",
         "type": "codehinter",
         "description": "Enter prompt",
-        "height": "150px"
+        "height": "150px",
+        "editorType": "extendedSingleLine"
       },
       "max_tokens": {
         "label": "Max Tokens",
@@ -77,7 +78,8 @@
         "type": "codehinter",
         "description": "Enter message",
         "placeholder": "Draft an email or other piece of writing",
-        "height": "150px"
+        "height": "150px",
+        "editorType": "extendedSingleLine"
       },
       "max_tokens": {
         "label": "Max Tokens",
diff --git a/plugins/packages/airtable/lib/operations.json b/plugins/packages/airtable/lib/operations.json
index 79a2234b2f..20ea08362f 100644
--- a/plugins/packages/airtable/lib/operations.json
+++ b/plugins/packages/airtable/lib/operations.json
@@ -143,6 +143,7 @@
         "type": "codehinter",
         "description": "Enter list of records",
         "height": "150px",
+        "editorType": "extendedSingleLine",
         "placeholder": "[{ \"fields\": {} }]"
       }
     },
@@ -185,7 +186,8 @@
         "key": "body",
         "type": "codehinter",
         "description": "Enter body",
-        "height": "150px"
+        "height": "150px",
+        "editorType": "extendedSingleLine"
       }
     },
     "delete_record": {
diff --git a/plugins/packages/amazonses/lib/operations.json b/plugins/packages/amazonses/lib/operations.json
index bfe31b07ca..58cd253e81 100644
--- a/plugins/packages/amazonses/lib/operations.json
+++ b/plugins/packages/amazonses/lib/operations.json
@@ -1,4 +1,3 @@
-
 {
   "$schema": "https://raw.githubusercontent.com/ToolJet/ToolJet/develop/plugins/schemas/operations.schema.json",
   "title": "Amazon SES datasource",
@@ -78,7 +77,7 @@
         "type": "codehinter",
         "description": "Supports HTML",
         "height": "150px",
-        "mode": "handlebars",
+        "editorType": "extendedSingleLine",
         "lineNumbers": true
       }
     }
diff --git a/plugins/packages/appwrite/lib/operations.json b/plugins/packages/appwrite/lib/operations.json
index 253357d6dc..eb9234f9cd 100644
--- a/plugins/packages/appwrite/lib/operations.json
+++ b/plugins/packages/appwrite/lib/operations.json
@@ -1,4 +1,3 @@
-
 {
   "$schema": "https://raw.githubusercontent.com/ToolJet/ToolJet/develop/plugins/schemas/operations.schema.json",
   "title": "Appwrite datasource",
@@ -38,7 +37,7 @@
         }
       ]
     },
-    "list_docs":{
+    "list_docs": {
       "collectionId": {
         "label": "Collection ID",
         "key": "collectionId",
@@ -177,7 +176,8 @@
         "key": "body",
         "type": "codehinter",
         "description": "Enter document body",
-        "height": "150px"
+        "height": "150px",
+        "editorType": "extendedSingleLine"
       }
     },
     "update_document": {
@@ -206,7 +206,8 @@
         "key": "body",
         "type": "codehinter",
         "description": "Enter document body",
-        "height": "150px"
+        "height": "150px",
+        "editorType": "extendedSingleLine"
       }
     },
     "delete_document": {
@@ -260,7 +261,8 @@
         "type": "codehinter",
         "mode": "javascript",
         "description": "Enter records",
-        "height": "150px"
+        "height": "150px",
+        "editorType": "extendedSingleLine"
       }
     }
   }
diff --git a/plugins/packages/athena/lib/operations.json b/plugins/packages/athena/lib/operations.json
index 5557e6a2be..43903c9506 100644
--- a/plugins/packages/athena/lib/operations.json
+++ b/plugins/packages/athena/lib/operations.json
@@ -1,4 +1,3 @@
-
 {
   "$schema": "https://raw.githubusercontent.com/ToolJet/ToolJet/develop/plugins/schemas/operations.schema.json",
   "title": "Amazon Athena datasource",
@@ -25,7 +24,8 @@
         "key": "query",
         "type": "codehinter",
         "description": "Enter query",
-        "height": "150px"
+        "height": "150px",
+        "editorType": "extendedSingleLine"
       },
       "Pagination": {
         "label": "Pagination",
@@ -62,4 +62,4 @@
       }
     }
   }
-}
+}
\ No newline at end of file
diff --git a/plugins/packages/baserow/lib/operations.json b/plugins/packages/baserow/lib/operations.json
index 6039579534..88f4aafcbb 100644
--- a/plugins/packages/baserow/lib/operations.json
+++ b/plugins/packages/baserow/lib/operations.json
@@ -1,4 +1,3 @@
-
 {
   "$schema": "https://raw.githubusercontent.com/ToolJet/ToolJet/develop/plugins/schemas/operations.schema.json",
   "title": "Baserow datasource",
@@ -110,6 +109,7 @@
         "type": "codehinter",
         "description": "Enter list of records",
         "height": "150px",
+        "editorType": "extendedSingleLine",
         "placeholder": "{ fieldName: 'Value' }"
       }
     },
@@ -142,6 +142,7 @@
         "type": "codehinter",
         "description": "Enter list of records",
         "height": "150px",
+        "editorType": "extendedSingleLine",
         "placeholder": "{ fieldName: 'Value' }"
       }
     },
@@ -205,4 +206,4 @@
       }
     }
   }
-}
+}
\ No newline at end of file
diff --git a/plugins/packages/bigquery/lib/operations.json b/plugins/packages/bigquery/lib/operations.json
index cd32293b83..a68dc0bc17 100644
--- a/plugins/packages/bigquery/lib/operations.json
+++ b/plugins/packages/bigquery/lib/operations.json
@@ -49,7 +49,6 @@
         }
       ]
     },
-
     "insert_record": {
       "tableId": {
         "label": "Table id",
@@ -80,10 +79,10 @@
         "mode": "javascript",
         "placeholder": "[{name: 'Tom', age: 30},{name: 'Jane', age: 32}]",
         "description": "Enter rows",
-        "height": "150px"
+        "height": "150px",
+        "editorType": "extendedSingleLine"
       }
     },
-
     "delete_record": {
       "tableId": {
         "label": "Table id",
@@ -114,7 +113,8 @@
         "mode": "javascript",
         "placeholder": "CustomerName='Alfreds Futterkiste'",
         "description": "Enter condition",
-        "height": "150px"
+        "height": "150px",
+        "editorType": "extendedSingleLine"
       },
       "queryOptions": {
         "label": "Query options",
@@ -123,7 +123,8 @@
         "mode": "javascript",
         "placeholder": "{ location: 'US', dryRun: true }",
         "description": "Enter query options",
-        "height": "150px"
+        "height": "150px",
+        "editorType": "extendedSingleLine"
       },
       "queryResultsOptions": {
         "label": "Query results options",
@@ -132,10 +133,10 @@
         "mode": "javascript",
         "placeholder": "{ wrapIntegers: true }",
         "description": "Enter Query results options",
-        "height": "150px"
+        "height": "150px",
+        "editorType": "extendedSingleLine"
       }
     },
-
     "create_table": {
       "tableId": {
         "label": "Table id",
@@ -166,7 +167,8 @@
         "mode": "javascript",
         "placeholder": "{schema: [{name: 'Name', type: 'STRING', mode: 'REQUIRED'},{name: 'Age', type: 'INTEGER'}], location: 'US' }",
         "description": "Enter options",
-        "height": "150px"
+        "height": "150px",
+        "editorType": "extendedSingleLine"
       }
     },
     "delete_table": {
@@ -233,7 +235,8 @@
         "type": "codehinter",
         "placeholder": "column1, column2, ... ",
         "description": "Enter viewcolumns",
-        "height": "150px"
+        "height": "150px",
+        "editorType": "extendedSingleLine"
       },
       "condition": {
         "label": "Condition",
@@ -242,7 +245,8 @@
         "mode": "javascript",
         "placeholder": "CustomerName='Alfreds Futterkiste'",
         "description": "Enter condition",
-        "height": "150px"
+        "height": "150px",
+        "editorType": "extendedSingleLine"
       },
       "queryOptions": {
         "label": "Query options",
@@ -251,7 +255,8 @@
         "mode": "javascript",
         "placeholder": "{ location: 'US', dryRun: true }",
         "description": "Enter query options",
-        "height": "150px"
+        "height": "150px",
+        "editorType": "extendedSingleLine"
       },
       "queryResultsOptions": {
         "label": "Query results options",
@@ -260,7 +265,8 @@
         "mode": "javascript",
         "placeholder": "{ wrapIntegers: true }",
         "description": "Enter Query results options",
-        "height": "150px"
+        "height": "150px",
+        "editorType": "extendedSingleLine"
       }
     },
     "update_record": {
@@ -292,7 +298,8 @@
         "type": "codehinter",
         "placeholder": "{{({name:'bob',age:30})}}",
         "description": "Enter columns",
-        "height": "150px"
+        "height": "150px",
+        "editorType": "extendedSingleLine"
       },
       "condition": {
         "label": "Condition",
@@ -301,7 +308,8 @@
         "mode": "javascript",
         "placeholder": "CustomerName='Alfreds Futterkiste'",
         "description": "Enter condition",
-        "height": "150px"
+        "height": "150px",
+        "editorType": "extendedSingleLine"
       },
       "queryOptions": {
         "label": "Query options",
@@ -310,7 +318,8 @@
         "mode": "javascript",
         "placeholder": "{ location: 'US', dryRun: true }",
         "description": "Enter query options",
-        "height": "150px"
+        "height": "150px",
+        "editorType": "extendedSingleLine"
       },
       "queryResultsOptions": {
         "label": "Query results options",
@@ -319,7 +328,8 @@
         "mode": "javascript",
         "placeholder": "{ wrapIntegers: true }",
         "description": "Enter Query results options",
-        "height": "150px"
+        "height": "150px",
+        "editorType": "extendedSingleLine"
       }
     },
     "list_tables": {
@@ -340,10 +350,10 @@
         "label": "Query",
         "key": "query",
         "type": "codehinter",
-        "mode": "text",
         "placeholder": "SELECT name FROM `bigquery-public-data.usa_names.usa_1910_2013` WHERE state = 'TX' LIMIT 100",
         "description": "Enter query",
-        "height": "150px"
+        "height": "150px",
+        "editorType": "extendedSingleLine"
       },
       "queryOptions": {
         "label": "Query options",
@@ -352,7 +362,8 @@
         "mode": "javascript",
         "placeholder": "{ location: 'US', dryRun: true }",
         "description": "Enter query options",
-        "height": "150px"
+        "height": "150px",
+        "editorType": "extendedSingleLine"
       },
       "queryResultsOptions": {
         "label": "Query results options",
@@ -361,8 +372,9 @@
         "mode": "javascript",
         "placeholder": "{ wrapIntegers: true }",
         "description": "Enter Query results options",
-        "height": "150px"
+        "height": "150px",
+        "editorType": "extendedSingleLine"
       }
     }
   }
-}
+}
\ No newline at end of file
diff --git a/plugins/packages/clickhouse/lib/operations.json b/plugins/packages/clickhouse/lib/operations.json
index b06418d02f..e5305c4c5e 100644
--- a/plugins/packages/clickhouse/lib/operations.json
+++ b/plugins/packages/clickhouse/lib/operations.json
@@ -28,7 +28,8 @@
         "key": "query",
         "type": "codehinter",
         "description": "Enter query",
-        "height": "150px"
+        "height": "150px",
+        "editorType": "extendedSingleLine"
       }
     },
     "insert": {
@@ -37,7 +38,8 @@
         "type": "codehinter",
         "description": "Enter array of objects",
         "height": "150px",
-        "placeholder":"Enter array of objects"
+        "editorType": "extendedSingleLine",
+        "placeholder": "Enter array of objects"
       },
       "tablename": {
         "label": "Table name",
diff --git a/plugins/packages/couchdb/lib/operations.json b/plugins/packages/couchdb/lib/operations.json
index c38340cf3a..36ae690c74 100644
--- a/plugins/packages/couchdb/lib/operations.json
+++ b/plugins/packages/couchdb/lib/operations.json
@@ -107,6 +107,7 @@
         "type": "codehinter",
         "description": "Enter list of records",
         "height": "150px",
+        "editorType": "extendedSingleLine",
         "placeholder": "[{ \"fields\": \"value\"}]"
       }
     },
@@ -139,6 +140,7 @@
         "type": "codehinter",
         "description": "Enter body",
         "height": "150px",
+        "editorType": "extendedSingleLine",
         "placeholder": "[{ \"fields\": \"value\"}]"
       }
     },
@@ -173,6 +175,7 @@
         "type": "codehinter",
         "description": "",
         "height": "150px",
+        "editorType": "extendedSingleLine",
         "placeholder": ""
       }
     },
@@ -234,4 +237,4 @@
       }
     }
   }
-}
+}
\ No newline at end of file
diff --git a/plugins/packages/dynamodb/lib/operations.json b/plugins/packages/dynamodb/lib/operations.json
index c8bf565bcd..a10f1afc5d 100644
--- a/plugins/packages/dynamodb/lib/operations.json
+++ b/plugins/packages/dynamodb/lib/operations.json
@@ -67,7 +67,8 @@
         "type": "codehinter",
         "mode": "javascript",
         "description": "Enter key name",
-        "height": "150px"
+        "height": "150px",
+        "editorType": "extendedSingleLine"
       }
     },
     "query_table": {
@@ -77,7 +78,8 @@
         "type": "codehinter",
         "mode": "javascript",
         "description": "Enter query condition",
-        "height": "150px"
+        "height": "150px",
+        "editorType": "extendedSingleLine"
       }
     },
     "scan_table": {
@@ -87,7 +89,8 @@
         "type": "codehinter",
         "mode": "javascript",
         "description": "Enter scan condition",
-        "height": "150px"
+        "height": "150px",
+        "editorType": "extendedSingleLine"
       }
     },
     "delete_item": {
@@ -108,7 +111,8 @@
         "type": "codehinter",
         "mode": "javascript",
         "description": "Enter key name",
-        "height": "150px"
+        "height": "150px",
+        "editorType": "extendedSingleLine"
       }
     },
     "update_item": {
@@ -118,7 +122,8 @@
         "type": "codehinter",
         "mode": "javascript",
         "description": "Enter update condition",
-        "height": "150px"
+        "height": "150px",
+        "editorType": "extendedSingleLine"
       }
     },
     "create_table": {
@@ -150,7 +155,8 @@
         "type": "codehinter",
         "mode": "javascript",
         "description": "Enter new item details to insert",
-        "height": "150px"
+        "height": "150px",
+        "editorType": "extendedSingleLine"
       }
     }
   }
diff --git a/plugins/packages/elasticsearch/lib/operations.json b/plugins/packages/elasticsearch/lib/operations.json
index 92d1b0cde2..4b92fb8aa0 100644
--- a/plugins/packages/elasticsearch/lib/operations.json
+++ b/plugins/packages/elasticsearch/lib/operations.json
@@ -50,7 +50,8 @@
         "type": "codehinter",
         "placeholder": "{ \"name\": \"\" }",
         "description": "Enter query",
-        "height": "150px"
+        "height": "150px",
+        "editorType": "extendedSingleLine"
       }
     },
     "index_document": {
@@ -72,7 +73,8 @@
         "mode": "javascript",
         "placeholder": "{ \"name\": \"The Hitchhikers Guide to the Galaxy\" }",
         "description": "Enter body",
-        "height": "150px"
+        "height": "150px",
+        "editorType": "extendedSingleLine"
       }
     },
     "get": {
@@ -86,7 +88,6 @@
         "height": "36px",
         "className": "codehinter-plugins",
         "placeholder": "Enter index"
-        
       },
       "id": {
         "label": "Id",
@@ -130,7 +131,8 @@
         "mode": "javascript",
         "placeholder": "{ doc: { page_count: 225 } }",
         "description": "Enter body",
-        "height": "150px"
+        "height": "150px",
+        "editorType": "extendedSingleLine"
       }
     }
   }
diff --git a/plugins/packages/firestore/lib/operations.json b/plugins/packages/firestore/lib/operations.json
index 73e41ea898..1641bf6e19 100644
--- a/plugins/packages/firestore/lib/operations.json
+++ b/plugins/packages/firestore/lib/operations.json
@@ -192,7 +192,8 @@
         "key": "body",
         "type": "codehinter",
         "description": "Enter body",
-        "height": "150px"
+        "height": "150px",
+        "editorType": "extendedSingleLine"
       }
     },
     "update_document": {
@@ -212,7 +213,8 @@
         "key": "body",
         "type": "codehinter",
         "description": "Enter body",
-        "height": "150px"
+        "height": "150px",
+        "editorType": "extendedSingleLine"
       }
     },
     "set_document": {
@@ -232,7 +234,8 @@
         "key": "body",
         "type": "codehinter",
         "description": "Enter body",
-        "height": "150px"
+        "height": "150px",
+        "editorType": "extendedSingleLine"
       }
     },
     "bulk_update": {
@@ -264,7 +267,8 @@
         "type": "codehinter",
         "mode": "javascript",
         "description": "Enter records",
-        "height": "150px"
+        "height": "150px",
+        "editorType": "extendedSingleLine"
       }
     },
     "delete_document": {
diff --git a/plugins/packages/googlesheets/lib/operations.json b/plugins/packages/googlesheets/lib/operations.json
index 5e068e1472..677fadf251 100644
--- a/plugins/packages/googlesheets/lib/operations.json
+++ b/plugins/packages/googlesheets/lib/operations.json
@@ -97,6 +97,7 @@
         "type": "codehinter",
         "description": "Enter rows",
         "height": "150px",
+        "editorType": "extendedSingleLine",
         "placeholder": "Enter rows"
       }
     },
@@ -110,7 +111,6 @@
         "height": "36px",
         "className": "codehinter-plugins",
         "placeholder": "Enter spreadsheet_id"
-        
       }
     },
     "delete_row": {
@@ -218,6 +218,7 @@
         "key": "body",
         "type": "codehinter",
         "height": "150px",
+        "editorType": "extendedSingleLine",
         "description": "Enter body"
       }
     }
diff --git a/plugins/packages/graphql/lib/operations.json b/plugins/packages/graphql/lib/operations.json
index be0a7ca382..48264434b2 100644
--- a/plugins/packages/graphql/lib/operations.json
+++ b/plugins/packages/graphql/lib/operations.json
@@ -10,21 +10,24 @@
       "key": "query",
       "type": "codehinter",
       "description": "Enter query",
-      "height": "150px"
+      "height": "150px",
+      "editorType": "extendedSingleLine"
     },
     "variables": {
       "label": "Variables",
       "key": "variables",
       "type": "codehinter",
       "description": "Enter Variables",
-      "height": "150px"
+      "height": "150px",
+      "editorType": "extendedSingleLine"
     },
     "headers": {
       "label": "Headers",
       "key": "headers",
       "type": "react-component-headers",
       "description": "key-value pair headers for graphql api",
-      "height": "150px"
+      "height": "150px",
+      "editorType": "extendedSingleLine"
     }
   },
   "required": [
diff --git a/plugins/packages/influxdb/lib/operations.json b/plugins/packages/influxdb/lib/operations.json
index a46d619b57..837ffb5012 100644
--- a/plugins/packages/influxdb/lib/operations.json
+++ b/plugins/packages/influxdb/lib/operations.json
@@ -32,7 +32,6 @@
           "value": "query_suggestions_for_branching",
           "name": "Retrieve query suggestions for a branching suggestion"
         },
-
         {
           "value": "analyze_flux_query",
           "name": "Analyze a Flux query"
@@ -67,6 +66,7 @@
         "type": "codehinter",
         "description": "Enter query",
         "height": "150px",
+        "editorType": "extendedSingleLine",
         "placeholder": "Flux query script to be analyzed"
       }
     },
@@ -114,6 +114,7 @@
         "type": "codehinter",
         "description": "Enter query",
         "height": "150px",
+        "editorType": "extendedSingleLine",
         "placeholder": "Flux query script to be analyzed"
       }
     },
@@ -157,6 +158,7 @@
         "type": "codehinter",
         "description": "Enter data",
         "height": "150px",
+        "editorType": "extendedSingleLine",
         "placeholder": "Enter data"
       }
     },
@@ -167,10 +169,10 @@
         "type": "codehinter",
         "description": "Enter query",
         "height": "150px",
+        "editorType": "extendedSingleLine",
         "placeholder": "Flux query script to be analyzed"
       }
     },
-
     "query_suggestions_for_branching": {
       "name": {
         "label": "Name",
@@ -185,7 +187,6 @@
       }
     },
     "query_suggestions": {},
-
     "query_data": {
       "org": {
         "label": "Organization name or ID",
@@ -204,6 +205,7 @@
         "type": "codehinter",
         "description": "Enter query",
         "height": "150px",
+        "editorType": "extendedSingleLine",
         "placeholder": "Flux query script to be analyzed"
       }
     },
@@ -214,8 +216,9 @@
         "type": "codehinter",
         "description": "Enter query",
         "height": "150px",
+        "editorType": "extendedSingleLine",
         "placeholder": "Flux query script to be analyzed"
       }
     }
   }
-}
+}
\ No newline at end of file
diff --git a/plugins/packages/mailgun/lib/operations.json b/plugins/packages/mailgun/lib/operations.json
index 0ab52542f1..6273790da7 100644
--- a/plugins/packages/mailgun/lib/operations.json
+++ b/plugins/packages/mailgun/lib/operations.json
@@ -55,7 +55,7 @@
         "type": "codehinter",
         "description": "Enter text",
         "height": "150px",
-        "mode": "text"
+        "editorType": "extendedSingleLine"
       },
       "html": {
         "label": "Body as HTML",
@@ -63,9 +63,9 @@
         "type": "codehinter",
         "description": "Enter html",
         "height": "150px",
-        "mode": "handlebars",
+        "editorType": "extendedSingleLine",
         "lineNumbers": true
       }
     }
   }
-}
+}
\ No newline at end of file
diff --git a/plugins/packages/mariadb/lib/operations.json b/plugins/packages/mariadb/lib/operations.json
index 8c2ad27e52..195520c808 100644
--- a/plugins/packages/mariadb/lib/operations.json
+++ b/plugins/packages/mariadb/lib/operations.json
@@ -24,7 +24,8 @@
         "key": "query",
         "type": "codehinter",
         "description": "Enter query",
-        "height": "150px"
+        "height": "150px",
+        "editorType": "extendedSingleLine"
       }
     }
   }
diff --git a/plugins/packages/mongodb/lib/operations.json b/plugins/packages/mongodb/lib/operations.json
index 22f8e2a066..948a681771 100644
--- a/plugins/packages/mongodb/lib/operations.json
+++ b/plugins/packages/mongodb/lib/operations.json
@@ -105,7 +105,8 @@
         "mode": "javascript",
         "placeholder": "{ name: 'Steve', 'hobbies: [ 'hiking', 'tennis', 'fly fishing' ] }",
         "description": "Enter document",
-        "height": "150px"
+        "height": "150px",
+        "editorType": "extendedSingleLine"
       },
       "options": {
         "label": "Options",
@@ -114,7 +115,8 @@
         "mode": "javascript",
         "placeholder": "{ checkKeys: true }",
         "description": "Enter options",
-        "height": "150px"
+        "height": "150px",
+        "editorType": "extendedSingleLine"
       }
     },
     "insert_many": {
@@ -135,7 +137,8 @@
         "mode": "javascript",
         "placeholder": "[ { _id: 1, name: 'Steve' }, { _id: 2, name: 'Sally' } ]",
         "description": "Enter document",
-        "height": "150px"
+        "height": "150px",
+        "editorType": "extendedSingleLine"
       },
       "options": {
         "label": "Options",
@@ -144,7 +147,8 @@
         "mode": "javascript",
         "placeholder": "{ checkKeys: true }",
         "description": "Enter options",
-        "height": "150px"
+        "height": "150px",
+        "editorType": "extendedSingleLine"
       }
     },
     "find_one": {
@@ -165,7 +169,8 @@
         "mode": "javascript",
         "placeholder": "{ birth: { $lt: 'new Date({{new Date('01/01/1990').getTime()}})' } }",
         "description": "Enter filter",
-        "height": "150px"
+        "height": "150px",
+        "editorType": "extendedSingleLine"
       },
       "options": {
         "label": "Options",
@@ -174,7 +179,8 @@
         "mode": "javascript",
         "placeholder": "{ projection: { _id: 0, 'name.first': 0, birth: 1 }, sort: { birth: -1 }, limit: 10, skip: 2 }",
         "description": "Enter options",
-        "height": "150px"
+        "height": "150px",
+        "editorType": "extendedSingleLine"
       }
     },
     "find_many": {
@@ -195,7 +201,8 @@
         "mode": "javascript",
         "placeholder": "{ birth: { $lt: 'new Date({{new Date('01/01/1990').getTime()}})' } }",
         "description": "Enter filter",
-        "height": "150px"
+        "height": "150px",
+        "editorType": "extendedSingleLine"
       },
       "options": {
         "label": "Options",
@@ -204,7 +211,8 @@
         "mode": "javascript",
         "placeholder": "{ projection: { _id: 0, 'name.first': 0, birth: 1 }, sort: { birth: -1 }, limit: 10, skip: 2 }",
         "description": "Enter options",
-        "height": "150px"
+        "height": "150px",
+        "editorType": "extendedSingleLine"
       }
     },
     "count_total": {
@@ -225,7 +233,8 @@
         "mode": "javascript",
         "placeholder": "{ fullResponse: true }",
         "description": "Enter options",
-        "height": "150px"
+        "height": "150px",
+        "editorType": "extendedSingleLine"
       }
     },
     "count": {
@@ -246,7 +255,8 @@
         "mode": "javascript",
         "placeholder": "{ birth: { $lt: 'new Date({{new Date('01/01/1990').getTime()}})' } }",
         "description": "Enter filter",
-        "height": "150px"
+        "height": "150px",
+        "editorType": "extendedSingleLine"
       },
       "options": {
         "label": "Options",
@@ -255,7 +265,8 @@
         "mode": "javascript",
         "placeholder": "{ skip: 2 }",
         "description": "Enter options",
-        "height": "150px"
+        "height": "150px",
+        "editorType": "extendedSingleLine"
       }
     },
     "distinct": {
@@ -287,7 +298,8 @@
         "mode": "javascript",
         "placeholder": "{ directors: 'Barbra Streisand', }",
         "description": "Enter filter",
-        "height": "150px"
+        "height": "150px",
+        "editorType": "extendedSingleLine"
       },
       "options": {
         "label": "Options",
@@ -296,7 +308,8 @@
         "mode": "javascript",
         "placeholder": "{ comment: 'some comment' }",
         "description": "Enter options",
-        "height": "150px"
+        "height": "150px",
+        "editorType": "extendedSingleLine"
       }
     },
     "update_one": {
@@ -317,7 +330,8 @@
         "mode": "javascript",
         "placeholder": "{ directors: 'Barbra Streisand', }",
         "description": "Enter filter",
-        "height": "150px"
+        "height": "150px",
+        "editorType": "extendedSingleLine"
       },
       "update": {
         "label": "Update",
@@ -326,7 +340,8 @@
         "mode": "javascript",
         "placeholder": "{ $set: { status: 'Modified' } }",
         "description": "Enter update",
-        "height": "150px"
+        "height": "150px",
+        "editorType": "extendedSingleLine"
       },
       "options": {
         "label": "Options",
@@ -335,7 +350,8 @@
         "mode": "javascript",
         "placeholder": "{ comment: 'some comment' }",
         "description": "Enter options",
-        "height": "150px"
+        "height": "150px",
+        "editorType": "extendedSingleLine"
       }
     },
     "update_many": {
@@ -356,7 +372,8 @@
         "mode": "javascript",
         "placeholder": "{ directors: 'Barbra Streisand', }",
         "description": "Enter filter",
-        "height": "150px"
+        "height": "150px",
+        "editorType": "extendedSingleLine"
       },
       "update": {
         "label": "Update",
@@ -365,7 +382,8 @@
         "mode": "javascript",
         "placeholder": "{ $set: { status: 'Modified' } }",
         "description": "Enter update",
-        "height": "150px"
+        "height": "150px",
+        "editorType": "extendedSingleLine"
       },
       "options": {
         "label": "Options",
@@ -374,7 +392,8 @@
         "mode": "javascript",
         "placeholder": "{ comment: 'some comment' }",
         "description": "Enter options",
-        "height": "150px"
+        "height": "150px",
+        "editorType": "extendedSingleLine"
       }
     },
     "replace_one": {
@@ -395,7 +414,8 @@
         "mode": "javascript",
         "placeholder": "{ title: { $regex: 'The Cat from' } } }",
         "description": "Enter filter",
-        "height": "150px"
+        "height": "150px",
+        "editorType": "extendedSingleLine"
       },
       "replacement": {
         "label": "Replacement",
@@ -404,7 +424,8 @@
         "mode": "javascript",
         "placeholder": "{ title: { $regex: 'The Cat from some sector' } }",
         "description": "Enter replacement",
-        "height": "150px"
+        "height": "150px",
+        "editorType": "extendedSingleLine"
       },
       "options": {
         "label": "Options",
@@ -413,7 +434,8 @@
         "mode": "javascript",
         "placeholder": "{ comment: 'some comment' }",
         "description": "Enter options",
-        "height": "150px"
+        "height": "150px",
+        "editorType": "extendedSingleLine"
       }
     },
     "find_one_replace": {
@@ -434,7 +456,8 @@
         "mode": "javascript",
         "placeholder": "{ title: { $regex: 'The Cat from' } } }",
         "description": "Enter filter",
-        "height": "150px"
+        "height": "150px",
+        "editorType": "extendedSingleLine"
       },
       "replacement": {
         "label": "Replacement",
@@ -443,7 +466,8 @@
         "mode": "javascript",
         "placeholder": "{ title: { $regex: 'The Cat from some sector' } }",
         "description": "Enter replacement",
-        "height": "150px"
+        "height": "150px",
+        "editorType": "extendedSingleLine"
       },
       "options": {
         "label": "Options",
@@ -452,7 +476,8 @@
         "mode": "javascript",
         "placeholder": "{ comment: 'some comment' }",
         "description": "Enter options",
-        "height": "150px"
+        "height": "150px",
+        "editorType": "extendedSingleLine"
       }
     },
     "find_one_update": {
@@ -473,7 +498,8 @@
         "mode": "javascript",
         "placeholder": "{ directors: 'Barbra Streisand', }",
         "description": "Enter filter",
-        "height": "150px"
+        "height": "150px",
+        "editorType": "extendedSingleLine"
       },
       "update": {
         "label": "Update",
@@ -482,7 +508,8 @@
         "mode": "javascript",
         "placeholder": "{ $set: { status: 'Modified' } }",
         "description": "Enter update",
-        "height": "150px"
+        "height": "150px",
+        "editorType": "extendedSingleLine"
       },
       "options": {
         "label": "Options",
@@ -491,7 +518,8 @@
         "mode": "javascript",
         "placeholder": "{ upsert: true }",
         "description": "Enter options",
-        "height": "150px"
+        "height": "150px",
+        "editorType": "extendedSingleLine"
       }
     },
     "find_one_delete": {
@@ -512,7 +540,8 @@
         "mode": "javascript",
         "placeholder": "{ directors: 'Barbra Streisand', }",
         "description": "Enter filter",
-        "height": "150px"
+        "height": "150px",
+        "editorType": "extendedSingleLine"
       },
       "options": {
         "label": "Options",
@@ -521,7 +550,8 @@
         "mode": "javascript",
         "placeholder": "{ sort: { field: -1 } }",
         "description": "Enter options",
-        "height": "150px"
+        "height": "150px",
+        "editorType": "extendedSingleLine"
       }
     },
     "delete_one": {
@@ -542,7 +572,8 @@
         "mode": "javascript",
         "placeholder": "{ directors: 'Barbra Streisand', }",
         "description": "Enter filter",
-        "height": "150px"
+        "height": "150px",
+        "editorType": "extendedSingleLine"
       },
       "options": {
         "label": "Options",
@@ -551,7 +582,8 @@
         "mode": "javascript",
         "placeholder": "{  comment: 'some comment' }",
         "description": "Enter options",
-        "height": "150px"
+        "height": "150px",
+        "editorType": "extendedSingleLine"
       }
     },
     "delete_many": {
@@ -572,7 +604,8 @@
         "mode": "javascript",
         "placeholder": "{ directors: 'Barbra Streisand', }",
         "description": "Enter filter",
-        "height": "150px"
+        "height": "150px",
+        "editorType": "extendedSingleLine"
       },
       "options": {
         "label": "Options",
@@ -581,7 +614,8 @@
         "mode": "javascript",
         "placeholder": "{ comment: 'some comment' }",
         "description": "Enter options",
-        "height": "150px"
+        "height": "150px",
+        "editorType": "extendedSingleLine"
       }
     },
     "bulk_write": {
@@ -602,7 +636,8 @@
         "mode": "javascript",
         "placeholder": "[{ insertOne: { document: { directors: 'Barbra Streisand' } } }]",
         "description": "Enter operations",
-        "height": "150px"
+        "height": "150px",
+        "editorType": "extendedSingleLine"
       },
       "options": {
         "label": "Options",
@@ -611,7 +646,8 @@
         "mode": "javascript",
         "placeholder": "{ comment: 'some comment' }",
         "description": "Enter options",
-        "height": "150px"
+        "height": "150px",
+        "editorType": "extendedSingleLine"
       }
     },
     "aggregate": {
@@ -632,7 +668,8 @@
         "mode": "javascript",
         "placeholder": "[{ $match: { categories: 'Bakery' } }, { $group: { _id: '$stars', count: { $sum: 1 } } }]",
         "description": "Enter pipeline",
-        "height": "150px"
+        "height": "150px",
+        "editorType": "extendedSingleLine"
       },
       "options": {
         "label": "Options",
@@ -641,7 +678,8 @@
         "mode": "javascript",
         "placeholder": "{ comment: 'some comment' }",
         "description": "Enter options",
-        "height": "150px"
+        "height": "150px",
+        "editorType": "extendedSingleLine"
       }
     }
   }
diff --git a/plugins/packages/mssql/lib/operations.json b/plugins/packages/mssql/lib/operations.json
index 3e7d474ba5..4d6d6188e9 100644
--- a/plugins/packages/mssql/lib/operations.json
+++ b/plugins/packages/mssql/lib/operations.json
@@ -26,7 +26,8 @@
         "key": "query",
         "type": "codehinter",
         "description": "Enter query",
-        "height": "150px"
+        "height": "150px",
+        "editorType": "extendedSingleLine"
       }
     },
     "gui": {
@@ -71,6 +72,7 @@
           "type": "codehinter",
           "description": "Enter records",
           "height": "150px",
+          "editorType": "extendedSingleLine",
           "placeholder": "{{ [ ] }}"
         }
       }
diff --git a/plugins/packages/mysql/lib/operations.json b/plugins/packages/mysql/lib/operations.json
index 7147f0fcf8..5f638ee2a8 100644
--- a/plugins/packages/mysql/lib/operations.json
+++ b/plugins/packages/mysql/lib/operations.json
@@ -26,7 +26,8 @@
         "key": "query",
         "type": "codehinter",
         "description": "Enter query",
-        "height": "150px"
+        "height": "150px",
+        "editorType": "extendedSingleLine"
       }
     },
     "gui": {
@@ -53,7 +54,6 @@
           "height": "36px",
           "className": "codehinter-plugins",
           "placeholder": "Enter table"
-          
         },
         "primary_key_column": {
           "label": "Primary key column",
@@ -71,7 +71,8 @@
           "key": "records",
           "type": "codehinter",
           "description": "Enter records",
-          "height": "150px"
+          "height": "150px",
+          "editorType": "extendedSingleLine"
         }
       }
     }
diff --git a/plugins/packages/n8n/lib/operations.json b/plugins/packages/n8n/lib/operations.json
index fc0a797e66..4e8209fb3d 100644
--- a/plugins/packages/n8n/lib/operations.json
+++ b/plugins/packages/n8n/lib/operations.json
@@ -8,7 +8,7 @@
     "method": {
       "label": "Method",
       "key": "method",
-      "className":"col-md-4",
+      "className": "col-md-4",
       "type": "dropdown-component-flip",
       "description": "Single request type",
       "list": [
@@ -21,8 +21,8 @@
           "name": "POST"
         }
       ],
-      "commonFields":{
-        "url":{
+      "commonFields": {
+        "url": {
           "label": "Webhook URL",
           "key": "url",
           "type": "codehinter",
@@ -34,7 +34,7 @@
         }
       }
     },
-    "get":{
+    "get": {
       "parameters": {
         "label": "URL parameters",
         "key": "url_params",
@@ -42,10 +42,11 @@
         "mode": "javascript",
         "placeholder": "{ \"name\": \"bob\" }",
         "description": "Enter options",
-        "height": "150px"
+        "height": "150px",
+        "editorType": "extendedSingleLine"
       }
     },
-    "post":{
+    "post": {
       "parameters": {
         "label": "URL parameters",
         "key": "url_params",
@@ -53,7 +54,8 @@
         "mode": "javascript",
         "placeholder": "{ \"name\": \"bob\" }",
         "description": "Enter url parameters",
-        "height": "150px"
+        "height": "150px",
+        "editorType": "extendedSingleLine"
       },
       "body": {
         "label": "Body",
@@ -62,7 +64,8 @@
         "mode": "javascript",
         "placeholder": "{ \"age\": \"12\" }",
         "description": "Enter body parameters",
-        "height": "150px"
+        "height": "150px",
+        "editorType": "extendedSingleLine"
       }
     }
   }
diff --git a/plugins/packages/notion/lib/operations.json b/plugins/packages/notion/lib/operations.json
index 3bc341b4cb..23c51319bc 100644
--- a/plugins/packages/notion/lib/operations.json
+++ b/plugins/packages/notion/lib/operations.json
@@ -1,4 +1,3 @@
-
 {
   "$schema": "https://raw.githubusercontent.com/ToolJet/ToolJet/develop/plugins/schemas/operations.schema.json",
   "title": "Notion datasource",
@@ -9,7 +8,7 @@
     "resource": {
       "label": "Resource",
       "key": "resource",
-      "className":"col-md-4",
+      "className": "col-md-4",
       "type": "dropdown-component-flip",
       "description": "Resource select",
       "list": [
@@ -31,11 +30,11 @@
         }
       ]
     },
-    "database":{
+    "database": {
       "operation": {
         "label": "Operation",
         "key": "operation",
-        "className":"col-md-4",
+        "className": "col-md-4",
         "type": "dropdown-component-flip",
         "description": "Operation select",
         "list": [
@@ -57,8 +56,8 @@
           }
         ]
       },
-      "get_database":{
-        "database_id":{
+      "get_database": {
+        "database_id": {
           "label": "Database ID",
           "key": "database_id",
           "type": "codehinter",
@@ -69,8 +68,8 @@
           "description": "Enter database id here"
         }
       },
-      "query_database":{
-        "database_id":{
+      "query_database": {
+        "database_id": {
           "label": "Database ID",
           "key": "database_id",
           "type": "codehinter",
@@ -87,9 +86,10 @@
           "mode": "javascript",
           "placeholder": "{or: [{ property: 'In stock', checkbox: { equals: true, } },...]}",
           "description": "Enter filter object",
-          "height": "150px"
+          "height": "150px",
+          "editorType": "extendedSingleLine"
         },
-        "sorts":{
+        "sorts": {
           "label": "Sort",
           "key": "sorts",
           "type": "codehinter",
@@ -97,9 +97,10 @@
           "placeholder": "[{\"property\": \"Name\",\"direction\": \"ascending\"}]",
           "description": "Enter the sort array",
           "height": "150px",
-          "width":"400px"
+          "editorType": "extendedSingleLine",
+          "width": "400px"
         },
-        "limit":{
+        "limit": {
           "label": "Limit",
           "key": "limit",
           "type": "codehinter",
@@ -109,7 +110,7 @@
           "className": "codehinter-plugins",
           "description": "Enter limit here"
         },
-        "start_cursor":{
+        "start_cursor": {
           "label": "Start cursor",
           "key": "start_cursor",
           "type": "codehinter",
@@ -120,8 +121,8 @@
           "description": "Enter cursor id"
         }
       },
-      "create_database":{
-        "page_id":{
+      "create_database": {
+        "page_id": {
           "label": "Page ID",
           "key": "page_id",
           "type": "codehinter",
@@ -131,7 +132,7 @@
           "className": "codehinter-plugins",
           "description": "Enter page id here"
         },
-        "title":{
+        "title": {
           "label": "Title",
           "key": "title",
           "type": "codehinter",
@@ -139,9 +140,10 @@
           "placeholder": "Array of rich text objects \n [{\"type\": \"text\",\"text\": {\"content\": \"Grocery List\",\"link\": null}}]",
           "description": "Enter filter object",
           "height": "150px",
-          "width":"400px"
+          "editorType": "extendedSingleLine",
+          "width": "400px"
         },
-        "properties":{
+        "properties": {
           "label": "Properties",
           "key": "properties",
           "type": "codehinter",
@@ -150,10 +152,10 @@
           "description": "Enter filter object",
           "height": "200px"
         },
-        "icon_type":{
+        "icon_type": {
           "label": "Icon Type",
           "key": "icon_type",
-          "className":"col-md-4",
+          "className": "col-md-4",
           "type": "dropdown",
           "description": "Icon type select",
           "list": [
@@ -177,10 +179,10 @@
           "height": "36px",
           "className": "codehinter-plugins"
         },
-        "cover_type":{
+        "cover_type": {
           "label": "Cover Type",
           "key": "cover_type",
-          "className":"col-md-4",
+          "className": "col-md-4",
           "type": "dropdown",
           "description": "Cover type select",
           "list": [
@@ -201,8 +203,8 @@
           "className": "codehinter-plugins"
         }
       },
-      "update_database":{
-        "database_id":{
+      "update_database": {
+        "database_id": {
           "label": "Database ID",
           "key": "database_id",
           "type": "codehinter",
@@ -212,7 +214,7 @@
           "className": "codehinter-plugins",
           "description": "Enter database id here"
         },
-        "title":{
+        "title": {
           "label": "Title",
           "key": "title",
           "type": "codehinter",
@@ -220,9 +222,10 @@
           "placeholder": "Array of rich text objects \n [{\"type\": \"text\",\"text\": {\"content\": \"Grocery List\",\"link\": null}}]",
           "description": "Enter filter object",
           "height": "150px",
-          "width":"400px"
+          "editorType": "extendedSingleLine",
+          "width": "400px"
         },
-        "properties":{
+        "properties": {
           "label": "Properties",
           "key": "properties",
           "type": "codehinter",
@@ -231,10 +234,10 @@
           "description": "Enter filter object",
           "height": "200px"
         },
-        "icon_type":{
+        "icon_type": {
           "label": "Icon Type",
           "key": "icon_type",
-          "className":"col-md-4",
+          "className": "col-md-4",
           "type": "dropdown",
           "description": "Icon type select",
           "list": [
@@ -258,10 +261,10 @@
           "height": "36px",
           "className": "codehinter-plugins"
         },
-        "cover_type":{
+        "cover_type": {
           "label": "Cover Type",
           "key": "cover_type",
-          "className":"col-md-4",
+          "className": "col-md-4",
           "type": "dropdown",
           "description": "Cover type select",
           "list": [
@@ -283,11 +286,11 @@
         }
       }
     },
-    "page":{
+    "page": {
       "operation": {
         "label": "Operation",
         "key": "operation",
-        "className":"col-md-4",
+        "className": "col-md-4",
         "type": "dropdown-component-flip",
         "description": "Operation select",
         "list": [
@@ -313,8 +316,8 @@
           }
         ]
       },
-      "get_page":{
-        "page_id":{
+      "get_page": {
+        "page_id": {
           "label": "Page ID",
           "key": "page_id",
           "type": "codehinter",
@@ -325,11 +328,11 @@
           "description": "Enter page id here"
         }
       },
-      "create_page":{
+      "create_page": {
         "parent_type": {
           "label": "Parent Type",
           "key": "parent_type",
-          "className":"col-md-4",
+          "className": "col-md-4",
           "type": "dropdown-component-flip",
           "description": "Parent select",
           "list": [
@@ -343,8 +346,8 @@
             }
           ]
         },
-        "page_id":{
-          "page_id":{
+        "page_id": {
+          "page_id": {
             "label": "Page ID",
             "key": "page_id",
             "type": "codehinter",
@@ -354,7 +357,7 @@
             "className": "codehinter-plugins",
             "description": "Enter page id here"
           },
-          "properties":{
+          "properties": {
             "label": "Properties",
             "key": "properties",
             "type": "codehinter",
@@ -363,7 +366,7 @@
             "description": "Enter filter object",
             "height": "200px"
           },
-          "children":{
+          "children": {
             "label": "Children (Blocks)",
             "key": "children",
             "type": "codehinter",
@@ -372,10 +375,10 @@
             "description": "Enter blocks array",
             "height": "200px"
           },
-          "icon_type":{
+          "icon_type": {
             "label": "Icon Type",
             "key": "icon_type",
-            "className":"col-md-4",
+            "className": "col-md-4",
             "type": "dropdown",
             "description": "Icon type select",
             "list": [
@@ -399,10 +402,10 @@
             "height": "36px",
             "className": "codehinter-plugins"
           },
-          "cover_type":{
+          "cover_type": {
             "label": "Cover Type",
             "key": "cover_type",
-            "className":"col-md-4",
+            "className": "col-md-4",
             "type": "dropdown",
             "description": "Cover type select",
             "list": [
@@ -423,8 +426,8 @@
             "className": "codehinter-plugins"
           }
         },
-        "database_id":{
-          "database_id":{
+        "database_id": {
+          "database_id": {
             "label": "Database ID",
             "key": "database_id",
             "type": "codehinter",
@@ -434,7 +437,7 @@
             "className": "codehinter-plugins",
             "description": "Enter database id here"
           },
-          "properties":{
+          "properties": {
             "label": "Properties",
             "key": "properties",
             "type": "codehinter",
@@ -443,7 +446,7 @@
             "description": "Enter filter object",
             "height": "200px"
           },
-          "children":{
+          "children": {
             "label": "Children (Blocks)",
             "key": "children",
             "type": "codehinter",
@@ -452,10 +455,10 @@
             "description": "Enter blocks array",
             "height": "200px"
           },
-          "icon_type":{
+          "icon_type": {
             "label": "Icon Type",
             "key": "icon_type",
-            "className":"col-md-4",
+            "className": "col-md-4",
             "type": "dropdown",
             "description": "Icon type select",
             "list": [
@@ -479,10 +482,10 @@
             "height": "36px",
             "className": "codehinter-plugins"
           },
-          "cover_type":{
+          "cover_type": {
             "label": "Cover Type",
             "key": "cover_type",
-            "className":"col-md-4",
+            "className": "col-md-4",
             "type": "dropdown",
             "description": "Cover type select",
             "list": [
@@ -504,8 +507,8 @@
           }
         }
       },
-      "update_page":{
-        "page_id":{
+      "update_page": {
+        "page_id": {
           "label": "Page ID",
           "key": "page_id",
           "type": "codehinter",
@@ -515,7 +518,7 @@
           "className": "codehinter-plugins",
           "description": "Enter page id here"
         },
-        "properties":{
+        "properties": {
           "label": "Properties",
           "key": "properties",
           "type": "codehinter",
@@ -524,10 +527,10 @@
           "description": "Enter filter object",
           "height": "200px"
         },
-        "icon_type":{
+        "icon_type": {
           "label": "Icon Type",
           "key": "icon_type",
-          "className":"col-md-4",
+          "className": "col-md-4",
           "type": "dropdown",
           "description": "Icon type select",
           "list": [
@@ -551,10 +554,10 @@
           "height": "36px",
           "className": "codehinter-plugins"
         },
-        "cover_type":{
+        "cover_type": {
           "label": "Cover Type",
           "key": "cover_type",
-          "className":"col-md-4",
+          "className": "col-md-4",
           "type": "dropdown",
           "description": "Cover type select",
           "list": [
@@ -575,8 +578,8 @@
           "className": "codehinter-plugins"
         }
       },
-      "get_page_property":{
-        "page_id":{
+      "get_page_property": {
+        "page_id": {
           "label": "Page ID",
           "key": "page_id",
           "type": "codehinter",
@@ -586,7 +589,7 @@
           "className": "codehinter-plugins",
           "description": "Enter page id here"
         },
-        "property_id":{
+        "property_id": {
           "label": "Property ID",
           "key": "property_id",
           "type": "codehinter",
@@ -596,7 +599,7 @@
           "className": "codehinter-plugins",
           "description": "Enter property id here"
         },
-        "limit":{
+        "limit": {
           "label": "Limit",
           "key": "limit",
           "type": "codehinter",
@@ -606,7 +609,7 @@
           "className": "codehinter-plugins",
           "description": "Enter limit here"
         },
-        "start_cursor":{
+        "start_cursor": {
           "label": "Start cursor",
           "key": "start_cursor",
           "type": "codehinter",
@@ -617,8 +620,8 @@
           "description": "Enter cursor id"
         }
       },
-      "archive_page":{
-        "page_id":{
+      "archive_page": {
+        "page_id": {
           "label": "Page ID",
           "key": "page_id",
           "type": "codehinter",
@@ -647,11 +650,11 @@
         }
       }
     },
-    "block":{
+    "block": {
       "operation": {
         "label": "Operation",
         "key": "operation",
-        "className":"col-md-4",
+        "className": "col-md-4",
         "type": "dropdown-component-flip",
         "description": "Operation select",
         "list": [
@@ -677,8 +680,8 @@
           }
         ]
       },
-      "get_block":{
-        "block_id":{
+      "get_block": {
+        "block_id": {
           "label": "Block ID",
           "key": "block_id",
           "type": "codehinter",
@@ -689,8 +692,8 @@
           "description": "Enter block id here"
         }
       },
-      "update_block":{
-        "block_id":{
+      "update_block": {
+        "block_id": {
           "label": "Block ID",
           "key": "block_id",
           "type": "codehinter",
@@ -700,7 +703,7 @@
           "className": "codehinter-plugins",
           "description": "Enter block id here"
         },
-        "properties":{
+        "properties": {
           "label": "Properties",
           "key": "properties",
           "type": "codehinter",
@@ -731,8 +734,8 @@
           ]
         }
       },
-      "get_block_children":{
-        "block_id":{
+      "get_block_children": {
+        "block_id": {
           "label": "Block ID",
           "key": "block_id",
           "type": "codehinter",
@@ -742,7 +745,7 @@
           "className": "codehinter-plugins",
           "description": "Enter block id here"
         },
-        "limit":{
+        "limit": {
           "label": "Limit",
           "key": "limit",
           "type": "codehinter",
@@ -752,7 +755,7 @@
           "className": "codehinter-plugins",
           "description": "Enter limit here"
         },
-        "start_cursor":{
+        "start_cursor": {
           "label": "Start cursor",
           "key": "start_cursor",
           "type": "codehinter",
@@ -763,8 +766,8 @@
           "description": "Enter cursor id"
         }
       },
-      "append_block_children":{
-        "block_id":{
+      "append_block_children": {
+        "block_id": {
           "label": "Block ID",
           "key": "block_id",
           "type": "codehinter",
@@ -774,7 +777,7 @@
           "className": "codehinter-plugins",
           "description": "Enter block id here"
         },
-        "children":{
+        "children": {
           "label": "Children (Blocks)",
           "key": "children",
           "type": "codehinter",
@@ -784,8 +787,8 @@
           "height": "200px"
         }
       },
-      "delete_block":{
-        "block_id":{
+      "delete_block": {
+        "block_id": {
           "label": "Block ID",
           "key": "block_id",
           "type": "codehinter",
@@ -797,11 +800,11 @@
         }
       }
     },
-    "user":{
+    "user": {
       "operation": {
         "label": "Operation",
         "key": "operation",
-        "className":"col-md-4",
+        "className": "col-md-4",
         "type": "dropdown-component-flip",
         "description": "Operation select",
         "list": [
@@ -815,8 +818,8 @@
           }
         ]
       },
-      "get_user":{
-        "user_id":{
+      "get_user": {
+        "user_id": {
           "label": "User ID",
           "key": "user_id",
           "type": "codehinter",
@@ -827,8 +830,8 @@
           "description": "Enter user id here"
         }
       },
-      "list_users":{
-        "limit":{
+      "list_users": {
+        "limit": {
           "label": "Limit",
           "key": "limit",
           "type": "codehinter",
@@ -838,7 +841,7 @@
           "className": "codehinter-plugins",
           "description": "Enter limit here"
         },
-        "start_cursor":{
+        "start_cursor": {
           "label": "Start cursor",
           "key": "start_cursor",
           "type": "codehinter",
diff --git a/plugins/packages/oracledb/lib/operations.json b/plugins/packages/oracledb/lib/operations.json
index 4ea9e5460b..c7ecae0178 100644
--- a/plugins/packages/oracledb/lib/operations.json
+++ b/plugins/packages/oracledb/lib/operations.json
@@ -1,4 +1,3 @@
-
 {
   "$schema": "https://raw.githubusercontent.com/ToolJet/ToolJet/develop/plugins/schemas/operations.schema.json",
   "title": "Oracle DB datasource",
@@ -28,7 +27,8 @@
         "type": "codehinter",
         "description": "Enter query",
         "placeholder": "SELECT * FROM customers",
-        "height": "150px"
+        "height": "150px",
+        "editorType": "extendedSingleLine"
       }
     },
     "gui": {
@@ -55,7 +55,6 @@
           "height": "36px",
           "className": "codehinter-plugins",
           "placeholder": "Enter table"
-          
         },
         "primary_key_column": {
           "label": "Primary key column",
@@ -73,7 +72,8 @@
           "key": "records",
           "type": "codehinter",
           "description": "Enter records",
-          "height": "150px"
+          "height": "150px",
+          "editorType": "extendedSingleLine"
         }
       }
     }
diff --git a/plugins/packages/postgresql/lib/operations.json b/plugins/packages/postgresql/lib/operations.json
index 50fda5e4f6..389d30e886 100644
--- a/plugins/packages/postgresql/lib/operations.json
+++ b/plugins/packages/postgresql/lib/operations.json
@@ -28,7 +28,8 @@
         "key": "query",
         "type": "codehinter",
         "description": "Enter query",
-        "height": "150px"
+        "height": "150px",
+        "editorType": "extendedSingleLine"
       }
     },
     "gui": {
@@ -73,6 +74,7 @@
           "type": "codehinter",
           "description": "Enter records",
           "height": "150px",
+          "editorType": "extendedSingleLine",
           "placeholder": "{{ [ ] }}"
         }
       }
diff --git a/plugins/packages/redis/lib/operations.json b/plugins/packages/redis/lib/operations.json
index 785da75cf0..bb1350ab71 100644
--- a/plugins/packages/redis/lib/operations.json
+++ b/plugins/packages/redis/lib/operations.json
@@ -12,7 +12,8 @@
       "type": "codehinter",
       "description": "Enter query",
       "placeholder": "PING",
-      "height": "150px"
+      "height": "150px",
+      "editorType": "extendedSingleLine"
     }
   },
   "required": [
diff --git a/plugins/packages/rethinkdb/lib/operations.json b/plugins/packages/rethinkdb/lib/operations.json
index fdb1cc7f03..ad3b193a88 100644
--- a/plugins/packages/rethinkdb/lib/operations.json
+++ b/plugins/packages/rethinkdb/lib/operations.json
@@ -207,6 +207,7 @@
         "type": "codehinter",
         "description": "Enter data to be inserted",
         "height": "150px",
+        "editorType": "extendedSingleLine",
         "placeholder": "Enter data to be inserted"
       }
     },
@@ -344,6 +345,7 @@
         "type": "codehinter",
         "description": "Enter data to be inserted",
         "height": "150px",
+        "editorType": "extendedSingleLine",
         "placeholder": "Enter data to be inserted"
       }
     },
@@ -376,8 +378,9 @@
         "type": "codehinter",
         "description": "Enter data to be inserted",
         "height": "150px",
+        "editorType": "extendedSingleLine",
         "placeholder": "Enter data to be inserted"
       }
     }
   }
-}
+}
\ No newline at end of file
diff --git a/plugins/packages/saphana/lib/operations.json b/plugins/packages/saphana/lib/operations.json
index aac1242ea9..5a5f0e02d8 100644
--- a/plugins/packages/saphana/lib/operations.json
+++ b/plugins/packages/saphana/lib/operations.json
@@ -24,7 +24,8 @@
         "key": "query",
         "type": "codehinter",
         "description": "Enter query",
-        "height": "150px"
+        "height": "150px",
+        "editorType": "extendedSingleLine"
       }
     }
   }
diff --git a/plugins/packages/sendgrid/lib/operations.json b/plugins/packages/sendgrid/lib/operations.json
index afbb20de1b..f3fb4bf333 100644
--- a/plugins/packages/sendgrid/lib/operations.json
+++ b/plugins/packages/sendgrid/lib/operations.json
@@ -66,7 +66,7 @@
         "type": "codehinter",
         "description": "Enter text",
         "height": "150px",
-        "mode": "text"
+        "editorType": "extendedSingleLine"
       },
       "html": {
         "label": "Body as HTML",
@@ -74,7 +74,7 @@
         "type": "codehinter",
         "description": "Enter html",
         "height": "150px",
-        "mode": "handlebars",
+        "editorType": "extendedSingleLine",
         "lineNumbers": true
       }
     }
diff --git a/plugins/packages/slack/lib/operations.json b/plugins/packages/slack/lib/operations.json
index 4a451a8128..082ea1a2f4 100644
--- a/plugins/packages/slack/lib/operations.json
+++ b/plugins/packages/slack/lib/operations.json
@@ -44,6 +44,7 @@
         "description": "Enter message",
         "className": "codehinter-plugins",
         "height": "150px",
+        "editorType": "extendedSingleLine",
         "placeholder": "Enter message"
       }
     },
@@ -58,7 +59,6 @@
         "className": "codehinter-plugins",
         "placeholder": "Enter channel id"
       },
-
       "limit": {
         "label": "Limit",
         "key": "limit",
@@ -69,7 +69,6 @@
         "className": "codehinter-plugins",
         "placeholder": "Enter limit"
       },
-
       "cursor": {
         "label": "Next cursor",
         "key": "cursor",
diff --git a/plugins/packages/smtp/lib/operations.json b/plugins/packages/smtp/lib/operations.json
index 1d3839432a..7b57fb457b 100644
--- a/plugins/packages/smtp/lib/operations.json
+++ b/plugins/packages/smtp/lib/operations.json
@@ -80,7 +80,8 @@
       "type": "codehinter",
       "description": "Field for message",
       "placeholder": "Enter message",
-      "height": "150px"
+      "height": "150px",
+      "editorType": "extendedSingleLine"
     },
     "htmlContent": {
       "key": "htmlContent",
@@ -88,7 +89,8 @@
       "type": "codehinter",
       "description": "Field for message",
       "placeholder": "Enter message",
-      "height": "150px"
+      "height": "150px",
+      "editorType": "extendedSingleLine"
     },
     "attachment_array": {
       "key": "attachment_array",
@@ -102,4 +104,4 @@
       "lineNumbers": false
     }
   }
-}
+}
\ No newline at end of file
diff --git a/plugins/packages/snowflake/lib/operations.json b/plugins/packages/snowflake/lib/operations.json
index 43cee39252..33ce468dfe 100644
--- a/plugins/packages/snowflake/lib/operations.json
+++ b/plugins/packages/snowflake/lib/operations.json
@@ -24,8 +24,9 @@
         "key": "query",
         "type": "codehinter",
         "description": "Enter query",
-        "height": "150px"
+        "height": "150px",
+        "editorType": "extendedSingleLine"
       }
     }
   }
-}
+}
\ No newline at end of file
diff --git a/plugins/packages/typesense/lib/operations.json b/plugins/packages/typesense/lib/operations.json
index a8f993fd72..a8af967c78 100644
--- a/plugins/packages/typesense/lib/operations.json
+++ b/plugins/packages/typesense/lib/operations.json
@@ -47,7 +47,8 @@
         "type": "codehinter",
         "placeholder": "{ \"name\": \"\" }",
         "description": "Enter schema",
-        "height": "150px"
+        "height": "150px",
+        "editorType": "extendedSingleLine"
       }
     },
     "search": {
@@ -68,7 +69,8 @@
         "type": "codehinter",
         "placeholder": "{ \"name\": \"\" }",
         "description": "Enter search parameters",
-        "height": "150px"
+        "height": "150px",
+        "editorType": "extendedSingleLine"
       }
     },
     "index_document": {
@@ -90,7 +92,8 @@
         "mode": "javascript",
         "placeholder": "{ \"name\": \"The Hitchhikers Guide to the Galaxy\" }",
         "description": "Enter document",
-        "height": "150px"
+        "height": "150px",
+        "editorType": "extendedSingleLine"
       }
     },
     "get": {
@@ -147,7 +150,8 @@
         "mode": "javascript",
         "placeholder": "{ doc: { page_count: 225 } }",
         "description": "Enter body",
-        "height": "150px"
+        "height": "150px",
+        "editorType": "extendedSingleLine"
       }
     },
     "delete": {
diff --git a/plugins/packages/woocommerce/lib/operations/definitions.ts b/plugins/packages/woocommerce/lib/operations/definitions.ts
index 264f5190b1..d7e075ae5f 100644
--- a/plugins/packages/woocommerce/lib/operations/definitions.ts
+++ b/plugins/packages/woocommerce/lib/operations/definitions.ts
@@ -5,6 +5,7 @@ export const body = {
   description: 'Enter data',
   height: '150px',
   placeholder: '',
+  editorType: 'extendedSingleLine',
 };
 
 export const customer_id = {
diff --git a/plugins/packages/zendesk/lib/operations.json b/plugins/packages/zendesk/lib/operations.json
index 26669c3a07..cb88aa2b77 100644
--- a/plugins/packages/zendesk/lib/operations.json
+++ b/plugins/packages/zendesk/lib/operations.json
@@ -1,4 +1,3 @@
-
 {
   "$schema": "https://raw.githubusercontent.com/ToolJet/ToolJet/develop/plugins/schemas/operations.schema.json",
   "title": "Zendesk datasource",
@@ -111,6 +110,7 @@
         "type": "codehinter",
         "className": "codehinter-plugins",
         "height": "150px",
+        "editorType": "extendedSingleLine",
         "description": "Enter ticket",
         "placeholder": "Enter ticket"
       }