diff --git a/src/lib/components/domains/status.ts b/src/lib/components/domains/status.ts
index 89bb1df41..27c696a41 100644
--- a/src/lib/components/domains/status.ts
+++ b/src/lib/components/domains/status.ts
@@ -13,10 +13,6 @@ export function isProxyRuleVerified(status: ProxyRuleStatusValue): boolean {
 }
 
 export function normalizeProxyRuleStatus(status: ProxyRuleStatusValue): ProxyRuleStatusValue {
-    if (status === ProxyRuleStatus.Created) {
-        return ProxyRuleStatus.Unverified;
-    }
-
     return status;
 }
 
diff --git a/src/lib/components/domains/viewLogsModal.svelte b/src/lib/components/domains/viewLogsModal.svelte
index 3f558c71a..9fd5fb366 100644
--- a/src/lib/components/domains/viewLogsModal.svelte
+++ b/src/lib/components/domains/viewLogsModal.svelte
@@ -43,7 +43,7 @@
         try {
             selectedProxyRule = await sdk
                 .forProject(page.params.region, page.params.project)
-                .proxy.updateRuleVerification({ ruleId: selectedProxyRule.$id });
+                .proxy.updateRuleStatus({ ruleId: selectedProxyRule.$id });
 
             await invalidate(Dependencies.DOMAINS);
             show = false;
diff --git a/src/routes/(console)/project-[region]-[project]/auth/updateOAuth.ts b/src/routes/(console)/project-[region]-[project]/auth/updateOAuth.ts
index 0c2195502..3931406c3 100644
--- a/src/routes/(console)/project-[region]-[project]/auth/updateOAuth.ts
+++ b/src/routes/(console)/project-[region]-[project]/auth/updateOAuth.ts
@@ -218,8 +218,8 @@ async function updateProjectOAuth({
                 clientSecret: getSecret('clientSecret'),
                 wellKnownURL: getDetail('wellKnownURL'),
                 authorizationURL: getDetail('authorizationURL'),
-                tokenUrl: getDetail('tokenUrl'),
-                userInfoUrl: getDetail('userInfoUrl'),
+                tokenURL: getDetail('tokenUrl'),
+                userInfoURL: getDetail('userInfoUrl'),
                 enabled
             });
         case OAuthProvider.Okta:
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/rows/create.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/rows/create.svelte
index abec07bf2..3262b1c1a 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/rows/create.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/rows/create.svelte
@@ -15,6 +15,7 @@
     import { Dependencies } from '$lib/constants';
     import { tick } from 'svelte';
     import { isRelationship, isRelationshipToMany, buildPayload } from './store';
+    import type { RowValue } from './store';
     import { hash } from '$lib/helpers/string';
 
     type CreateRow = {
@@ -70,7 +71,7 @@
     function prepareRowPayload(createRowObject: CreateRow): object {
         const { row, columns } = createRowObject;
 
-        const payload = structuredClone(row) as Record<string, unknown>;
+        const payload = structuredClone(row) as Record<string, RowValue>;
 
         for (const column of columns) {
             if (isRelationship(column) && !isRelationshipToMany(column)) {
@@ -79,7 +80,13 @@
 
                 if (value && typeof value === 'object') {
                     if (Array.isArray(value)) {
-                        payload[key] = value.map((item) => item?.$id).filter(Boolean);
+                        payload[key] = value
+                            .map((item) =>
+                                item && typeof item === 'object' && '$id' in item
+                                    ? (item.$id as string)
+                                    : null
+                            )
+                            .filter(Boolean);
                     } else {
                         payload[key] = (value as { $id: string })['$id'];
                     }
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/rows/store.ts b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/rows/store.ts
index c139eb585..ee1686c11 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/rows/store.ts
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/rows/store.ts
@@ -7,7 +7,7 @@ type RowPrimitive = string | number | bigint | boolean | null | undefined;
 interface RowObject {
     [key: string]: RowValue;
 }
-type RowValue = RowPrimitive | RowValue[] | RowObject;
+export type RowValue = RowPrimitive | RowValue[] | RowObject;
 
 export function isRelationshipToMany(field: Field) {
     if (!field) return false;
diff --git a/src/routes/(console)/project-[region]-[project]/functions/create-function/deploy/+page.svelte b/src/routes/(console)/project-[region]-[project]/functions/create-function/deploy/+page.svelte
index e0e389e91..200e0575d 100644
--- a/src/routes/(console)/project-[region]-[project]/functions/create-function/deploy/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/functions/create-function/deploy/+page.svelte
@@ -121,6 +121,7 @@
             const promises = variables.map((variable) =>
                 sdk.forProject(page.params.region, page.params.project).functions.createVariable({
                     functionId: func.$id,
+                    variableId: ID.unique(),
                     key: variable.key,
                     value: variable.value,
                     secret: variable.secret
diff --git a/src/routes/(console)/project-[region]-[project]/functions/create-function/manual/+page.svelte b/src/routes/(console)/project-[region]-[project]/functions/create-function/manual/+page.svelte
index 3e125c978..1e7296206 100644
--- a/src/routes/(console)/project-[region]-[project]/functions/create-function/manual/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/functions/create-function/manual/+page.svelte
@@ -90,6 +90,7 @@
             const promises = variables.map((variable) =>
                 sdk.forProject(page.params.region, page.params.project).functions.createVariable({
                     functionId: func.$id,
+                    variableId: ID.unique(),
                     key: variable.key,
                     value: variable.value,
                     secret: variable?.secret ?? false
diff --git a/src/routes/(console)/project-[region]-[project]/functions/create-function/repository-[repository]/+page.svelte b/src/routes/(console)/project-[region]-[project]/functions/create-function/repository-[repository]/+page.svelte
index 7b19202d0..0e022aabc 100644
--- a/src/routes/(console)/project-[region]-[project]/functions/create-function/repository-[repository]/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/functions/create-function/repository-[repository]/+page.svelte
@@ -132,6 +132,7 @@
             const promises = variables.map((variable) =>
                 sdk.forProject(page.params.region, page.params.project).functions.createVariable({
                     functionId: func.$id,
+                    variableId: ID.unique(),
                     key: variable.key,
                     value: variable.value,
                     secret: variable?.secret ?? false
diff --git a/src/routes/(console)/project-[region]-[project]/functions/create-function/template-[template]/+page.svelte b/src/routes/(console)/project-[region]-[project]/functions/create-function/template-[template]/+page.svelte
index cfb1bcd80..4a46da427 100644
--- a/src/routes/(console)/project-[region]-[project]/functions/create-function/template-[template]/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/functions/create-function/template-[template]/+page.svelte
@@ -190,6 +190,7 @@
                         .forProject(page.params.region, page.params.project)
                         .functions.createVariable({
                             functionId: func.$id,
+                            variableId: ID.unique(),
                             key: variable.name,
                             value: variable.value,
                             secret: variable?.secret ?? false
diff --git a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/+page.ts b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/+page.ts
index 5fdc16ceb..62b0175d1 100644
--- a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/+page.ts
+++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/+page.ts
@@ -31,8 +31,7 @@ export const load: PageLoad = async ({ depends, params, url, route, parent }) =>
             Query.orderDesc(''),
             Query.orderDesc('$updatedAt'),
             ...parsedQueries.values()
-        ],
-        search: search || undefined
+        ]
     });
 
     const organizationDomains = await fetchOrganizationDomainsForRules(
diff --git a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/add-domain/verify-[domain]/+page.svelte b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/add-domain/verify-[domain]/+page.svelte
index 7701ebd8d..a79271ebf 100644
--- a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/add-domain/verify-[domain]/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/add-domain/verify-[domain]/+page.svelte
@@ -73,7 +73,7 @@
         try {
             proxyRule = await sdk
                 .forProject(page.params.region, page.params.project)
-                .proxy.updateRuleVerification({ ruleId });
+                .proxy.updateRuleStatus({ ruleId });
 
             await Promise.all([
                 invalidate(Dependencies.DOMAINS),
diff --git a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/retryDomainModal.svelte b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/retryDomainModal.svelte
index 02a09d4c4..926b77930 100644
--- a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/retryDomainModal.svelte
+++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/retryDomainModal.svelte
@@ -68,7 +68,7 @@
         try {
             selectedProxyRule = await sdk
                 .forProject(page.params.region, page.params.project)
-                .proxy.updateRuleVerification({ ruleId: selectedProxyRule.$id });
+                .proxy.updateRuleStatus({ ruleId: selectedProxyRule.$id });
 
             await invalidate(Dependencies.FUNCTION_DOMAINS);
             show = false;
diff --git a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/settings/+page.svelte b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/settings/+page.svelte
index cdfb04752..6175d94b9 100644
--- a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/settings/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/settings/+page.svelte
@@ -24,6 +24,7 @@
     import UpdateVariables from '$routes/(console)/project-[region]-[project]/updateVariables.svelte';
     import { page } from '$app/state';
     import { Link } from '$lib/elements';
+    import { ID } from '@appwrite.io/console';
 
     export let data;
     let showAlert = true;
@@ -31,6 +32,7 @@
     const sdkCreateVariable = async (key: string, value: string, secret?: boolean) => {
         await sdk.forProject(page.params.region, page.params.project).functions.createVariable({
             functionId: data.function.$id,
+            variableId: ID.unique(),
             key,
             value,
             secret
diff --git a/src/routes/(console)/project-[region]-[project]/settings/domains/+page.ts b/src/routes/(console)/project-[region]-[project]/settings/domains/+page.ts
index bf7570e23..70d072a64 100644
--- a/src/routes/(console)/project-[region]-[project]/settings/domains/+page.ts
+++ b/src/routes/(console)/project-[region]-[project]/settings/domains/+page.ts
@@ -25,8 +25,7 @@ export const load: PageLoad = async ({ depends, url, route, params, parent }) =>
             Query.equal('type', RuleType.API),
             Query.equal('trigger', RuleTrigger.MANUAL),
             Query.orderDesc('$updatedAt')
-        ],
-        search: search || undefined
+        ]
     });
 
     const organizationDomains = await fetchOrganizationDomainsForRules(rules, organization.$id);
diff --git a/src/routes/(console)/project-[region]-[project]/settings/domains/add-domain/verify-[domain]/+page.svelte b/src/routes/(console)/project-[region]-[project]/settings/domains/add-domain/verify-[domain]/+page.svelte
index 93f725eb0..b32e4ff1b 100644
--- a/src/routes/(console)/project-[region]-[project]/settings/domains/add-domain/verify-[domain]/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/settings/domains/add-domain/verify-[domain]/+page.svelte
@@ -72,7 +72,7 @@
         try {
             proxyRule = await sdk
                 .forProject(page.params.region, page.params.project)
-                .proxy.updateRuleVerification({ ruleId });
+                .proxy.updateRuleStatus({ ruleId });
 
             await invalidate(Dependencies.DOMAINS);
             await goto(routeBase);
diff --git a/src/routes/(console)/project-[region]-[project]/settings/domains/retryDomainModal.svelte b/src/routes/(console)/project-[region]-[project]/settings/domains/retryDomainModal.svelte
index 1098b8d3f..20f895674 100644
--- a/src/routes/(console)/project-[region]-[project]/settings/domains/retryDomainModal.svelte
+++ b/src/routes/(console)/project-[region]-[project]/settings/domains/retryDomainModal.svelte
@@ -68,7 +68,7 @@
         try {
             selectedProxyRule = await sdk
                 .forProject(page.params.region, page.params.project)
-                .proxy.updateRuleVerification({ ruleId: selectedProxyRule.$id });
+                .proxy.updateRuleStatus({ ruleId: selectedProxyRule.$id });
 
             await invalidate(Dependencies.DOMAINS);
             show = false;
diff --git a/src/routes/(console)/project-[region]-[project]/sites/create-site/deploy/+page.svelte b/src/routes/(console)/project-[region]-[project]/sites/create-site/deploy/+page.svelte
index 97c6506f5..fa75d2794 100644
--- a/src/routes/(console)/project-[region]-[project]/sites/create-site/deploy/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/sites/create-site/deploy/+page.svelte
@@ -171,6 +171,7 @@
             const promises = variables.map((variable) =>
                 sdk.forProject(page.params.region, page.params.project).sites.createVariable({
                     siteId: site.$id,
+                    variableId: ID.unique(),
                     key: variable.key,
                     value: variable.value,
                     secret: variable.secret
diff --git a/src/routes/(console)/project-[region]-[project]/sites/create-site/manual/+page.svelte b/src/routes/(console)/project-[region]-[project]/sites/create-site/manual/+page.svelte
index 5a313e8f5..f2da210d0 100644
--- a/src/routes/(console)/project-[region]-[project]/sites/create-site/manual/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/sites/create-site/manual/+page.svelte
@@ -93,6 +93,7 @@
             const promises = variables.map((variable) =>
                 sdk.forProject(page.params.region, page.params.project).sites.createVariable({
                     siteId: site.$id,
+                    variableId: ID.unique(),
                     key: variable.key,
                     value: variable.value,
                     secret: variable?.secret ?? false
diff --git a/src/routes/(console)/project-[region]-[project]/sites/create-site/repositories/repository-[repository]/+page.svelte b/src/routes/(console)/project-[region]-[project]/sites/create-site/repositories/repository-[repository]/+page.svelte
index f4e18691b..aca5fe7bb 100644
--- a/src/routes/(console)/project-[region]-[project]/sites/create-site/repositories/repository-[repository]/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/sites/create-site/repositories/repository-[repository]/+page.svelte
@@ -143,6 +143,7 @@
             const promises = variables.map((variable) =>
                 sdk.forProject(page.params.region, page.params.project).sites.createVariable({
                     siteId: site.$id,
+                    variableId: ID.unique(),
                     key: variable.key,
                     value: variable.value,
                     secret: variable?.secret ?? false
diff --git a/src/routes/(console)/project-[region]-[project]/sites/create-site/templates/template-[template]/+page.svelte b/src/routes/(console)/project-[region]-[project]/sites/create-site/templates/template-[template]/+page.svelte
index 0e57e223a..a11121d55 100644
--- a/src/routes/(console)/project-[region]-[project]/sites/create-site/templates/template-[template]/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/sites/create-site/templates/template-[template]/+page.svelte
@@ -151,6 +151,7 @@
                 const promises = variables.map((variable) =>
                     sdk.forProject(page.params.region, page.params.project).sites.createVariable({
                         siteId: site.$id,
+                        variableId: ID.unique(),
                         key: variable.name,
                         value: variable.value,
                         secret: variable?.secret ?? false
diff --git a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/+page.ts b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/+page.ts
index 25c021aa6..b0ba589da 100644
--- a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/+page.ts
+++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/+page.ts
@@ -30,8 +30,7 @@ export const load = async ({ params, depends, url, route, parent }) => {
             Query.orderDesc(''),
             Query.orderDesc('$updatedAt'),
             ...parsedQueries.values()
-        ],
-        search: search || undefined
+        ]
     });
 
     const organizationDomains = await fetchOrganizationDomainsForRules(
diff --git a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/add-domain/verify-[domain]/+page.svelte b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/add-domain/verify-[domain]/+page.svelte
index 83eb4f33d..cd0f6f663 100644
--- a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/add-domain/verify-[domain]/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/add-domain/verify-[domain]/+page.svelte
@@ -72,7 +72,7 @@
         try {
             proxyRule = await sdk
                 .forProject(page.params.region, page.params.project)
-                .proxy.updateRuleVerification({ ruleId });
+                .proxy.updateRuleStatus({ ruleId });
 
             await Promise.all([
                 invalidate(Dependencies.DOMAINS),
diff --git a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/retryDomainModal.svelte b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/retryDomainModal.svelte
index 56fa02b6d..b7b74ae34 100644
--- a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/retryDomainModal.svelte
+++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/retryDomainModal.svelte
@@ -68,7 +68,7 @@
         try {
             selectedProxyRule = await sdk
                 .forProject(page.params.region, page.params.project)
-                .proxy.updateRuleVerification({ ruleId: selectedProxyRule.$id });
+                .proxy.updateRuleStatus({ ruleId: selectedProxyRule.$id });
 
             await invalidate(Dependencies.SITES_DOMAINS);
             show = false;
diff --git a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/settings/+page.svelte b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/settings/+page.svelte
index e91e06eeb..faddf5f36 100644
--- a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/settings/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/settings/+page.svelte
@@ -17,12 +17,14 @@
     import UpdateVariables from '$routes/(console)/project-[region]-[project]/updateVariables.svelte';
     import UpdateLogging from './updateLogging.svelte';
     import UpdateDeploymentRetention from './updateDeploymentRetention.svelte';
+    import { ID } from '@appwrite.io/console';
 
     export let data;
 
     const sdkCreateVariable = async (key: string, value: string, secret: boolean) => {
         await sdk.forProject(page.params.region, page.params.project).sites.createVariable({
             siteId: page.params.site,
+            variableId: ID.unique(),
             key,
             value,
             secret