diff --git a/src/lib/components/permissions/index.ts b/src/lib/components/permissions/index.ts
index 865f2d75c..01de280d9 100644
--- a/src/lib/components/permissions/index.ts
+++ b/src/lib/components/permissions/index.ts
@@ -1 +1,3 @@
 export { default as Permissions } from './permissions.svelte';
+export { default as Team } from './team.svelte';
+export { default as User } from './user.svelte';
diff --git a/src/routes/console/project-[project]/functions/createEvent.svelte b/src/routes/console/project-[project]/functions/createEvent.svelte
index 27e71bb02..d460996dd 100644
--- a/src/routes/console/project-[project]/functions/createEvent.svelte
+++ b/src/routes/console/project-[project]/functions/createEvent.svelte
@@ -13,11 +13,12 @@
     let inputData: string = null;
     let showInput = false;
 
-    const create = () => {
+    function create() {
         showCreate = false;
         $createFunction.events.push(copyValue);
         $createFunction = $createFunction;
-    };
+        console.log($createFunction);
+    }
 
     const events = ['create', 'update', 'delete'];
 
@@ -70,27 +71,46 @@
         //SERVICE
         if (service) {
             data.set('service', { value: service.name, description: 'service' });
+            data.set('serviceId', {
+                value: '*',
+                description: `ID of ${service?.name.slice(0, -1)}`
+            });
         }
 
         //REQUEST
         if (request) {
             if (request.name === 'documents') {
-                data.set('collection', {
-                    value: 'collections.*.documents',
+                data.set('request', {
+                    value: 'collections',
                     description: 'request'
                 });
-            } else
+                data.set('requestId', {
+                    value: '*',
+                    description: `ID of collection`
+                });
+                data.set('secondaryRequest', {
+                    value: 'documents',
+                    description: 'secondary request'
+                });
+                data.set('secondaryRequestId', {
+                    value: '*',
+                    description: `ID of document`
+                });
+            } else {
                 data.set('request', {
                     value: request.name,
                     description: `ID of ${service?.name.slice(0, -1)}`
                 });
-        } else if (service) data.set('request', { value: '*', description: 'request' });
+                data.set('requestId', {
+                    value: '*',
+                    description: `ID of ${request?.name.slice(0, -1)}`
+                });
+            }
+        }
 
         //EVENT
         if ((event && request?.events?.includes(event)) ?? service?.events?.includes(event)) {
             data.set('event', { value: event, description: 'event' });
-        } else if (request) {
-            data.set('event', { value: '*', description: `event` });
         }
 
         //ATTRIBUTE
@@ -118,6 +138,7 @@
         selectedRequest = null;
         selectedEvent = null;
         selectedAttribute = null;
+        helper = null;
     }
     $: if (!showInput) {
         helper = null;
diff --git a/src/routes/console/project-[project]/functions/wizard/step2.svelte b/src/routes/console/project-[project]/functions/wizard/step2.svelte
index e1902d41e..71546f27e 100644
--- a/src/routes/console/project-[project]/functions/wizard/step2.svelte
+++ b/src/routes/console/project-[project]/functions/wizard/step2.svelte
@@ -46,7 +46,7 @@
                                     <button
                                         class="button is-text is-only-icon"
                                         aria-label="delete id"
-                                        on:click={() => {
+                                        on:click|preventDefault={() => {
                                             $createFunction.execute =
                                                 $createFunction.execute.filter(
                                                     (item) => item !== id
diff --git a/src/routes/console/project-[project]/functions/wizard/step3.svelte b/src/routes/console/project-[project]/functions/wizard/step3.svelte
index 8b5c2360a..37912d053 100644
--- a/src/routes/console/project-[project]/functions/wizard/step3.svelte
+++ b/src/routes/console/project-[project]/functions/wizard/step3.svelte
@@ -16,7 +16,7 @@
 
     EVENT
     {#if $createFunction?.events?.length}
-        <div class="table-with-scroll">
+        <div class="table-with-scroll u-height-100-percents">
             <div class="table-wrapper">
                 <div class="table is-remove-outer-styles">
                     <ul class="table-thead">
@@ -32,7 +32,7 @@
                                     <button
                                         class="button is-text is-only-icon"
                                         aria-label="delete id"
-                                        on:click={() => {
+                                        on:click|preventDefault={() => {
                                             $createFunction.events = $createFunction.events.filter(
                                                 (item) => item !== id
                                             );