diff --git a/ngui/ui/src/components/JsonView/JsonView.tsx b/ngui/ui/src/components/JsonView/JsonView.tsx
index 96cbbe026..095de1757 100644
--- a/ngui/ui/src/components/JsonView/JsonView.tsx
+++ b/ngui/ui/src/components/JsonView/JsonView.tsx
@@ -13,7 +13,7 @@ const JsonView = ({ value, onChange, id, viewOnly = false }) => {
       height="auto"
       width="100%"
       onChange={onChange}
-      waitAfterKeyPress={0}
+      waitAfterKeyPress={1000}
       confirmGood={false}
       colors={theme.palette.json}
       viewOnly={viewOnly}
diff --git a/ngui/ui/src/components/OrganizationOptions/OrganizationOptions.tsx b/ngui/ui/src/components/OrganizationOptions/OrganizationOptions.tsx
index af86d1ec5..c4e887fa8 100644
--- a/ngui/ui/src/components/OrganizationOptions/OrganizationOptions.tsx
+++ b/ngui/ui/src/components/OrganizationOptions/OrganizationOptions.tsx
@@ -1,4 +1,4 @@
-import { useState } from "react";
+import { useEffect, useState } from "react";
 import AddOutlinedIcon from "@mui/icons-material/AddOutlined";
 import { CircularProgress } from "@mui/material";
 import Box from "@mui/material/Box";
@@ -39,6 +39,10 @@ const OrganizationOptions = ({
 
   const openSideModal = useOpenSideModal();
 
+  useEffect(() => {
+    setUpdatedValue(value);
+  }, [value]);
+
   const onJsonChange = ({ error, jsObject }) => {
     setUpdatedValue(jsObject);
     setIsValidJson(error === false);
diff --git a/ngui/ui/src/components/Resources/filterConfigs.tsx b/ngui/ui/src/components/Resources/filterConfigs.tsx
index 8e0d3bbb8..82c6e70ae 100644
--- a/ngui/ui/src/components/Resources/filterConfigs.tsx
+++ b/ngui/ui/src/components/Resources/filterConfigs.tsx
@@ -128,6 +128,10 @@ export const FILTER_CONFIGS = {
               type: {
                 type: "string",
                 enum: CLOUD_ACCOUNT_TYPES_LIST
+              },
+              account_id: {
+                type: "string",
+                nullable: true
               }
             }
           }