diff --git a/apps/docs/components/Navigation/NavBar.tsx b/apps/docs/components/Navigation/NavBar.tsx
index c821b2ab973..eb7ee10434f 100644
--- a/apps/docs/components/Navigation/NavBar.tsx
+++ b/apps/docs/components/Navigation/NavBar.tsx
@@ -8,8 +8,6 @@ import { REFERENCES } from './Navigation.constants'
 
 import { getPageType } from '~/lib/helpers'
 
-// import SearchButton from '../Search/SearchButton'
-
 const NavBar: FC = () => {
   const { isDarkMode, toggleTheme } = useTheme()
   const [mounted, setMounted] = useState(false)
diff --git a/apps/docs/components/Navigation/NavigationMenu/TopNavBar.tsx b/apps/docs/components/Navigation/NavigationMenu/TopNavBar.tsx
index 294446f7235..270269d5085 100644
--- a/apps/docs/components/Navigation/NavigationMenu/TopNavBar.tsx
+++ b/apps/docs/components/Navigation/NavigationMenu/TopNavBar.tsx
@@ -17,8 +17,6 @@ import { REFERENCES } from '~/components/Navigation/Navigation.constants'
 
 import { getPageType } from '~/lib/helpers'
 
-// import SearchButton from './../../Search/SearchButton'
-
 const TopNavBar: FC = () => {
   const { isDarkMode, toggleTheme } = useTheme()
   const [mounted, setMounted] = useState(false)
diff --git a/apps/docs/components/Navigation/NavigationMenu/TopNavBarRef.tsx b/apps/docs/components/Navigation/NavigationMenu/TopNavBarRef.tsx
index 765dce0f678..7501f116c2a 100644
--- a/apps/docs/components/Navigation/NavigationMenu/TopNavBarRef.tsx
+++ b/apps/docs/components/Navigation/NavigationMenu/TopNavBarRef.tsx
@@ -8,8 +8,6 @@ import { REFERENCES } from '~/components/Navigation/Navigation.constants'
 
 import { getPageType } from '~/lib/helpers'
 
-// import SearchButton from '~/components/Search/SearchButton'
-
 const TopNavBarRef: FC = () => {
   const { isDarkMode, toggleTheme } = useTheme()
   const [mounted, setMounted] = useState(false)
diff --git a/packages/ui/src/components/Command/AiCommand.tsx b/packages/ui/src/components/Command/AiCommand.tsx
index 54d269818d8..652d1a8cc60 100644
--- a/packages/ui/src/components/Command/AiCommand.tsx
+++ b/packages/ui/src/components/Command/AiCommand.tsx
@@ -141,6 +141,29 @@ const AiCommand = () => {
       setHasClippyError(false)
       setIsLoading(true)
 
+      let queryToSend = query
+
+      switch (currentPage) {
+        case COMMAND_ROUTES.AI:
+          queryToSend = query
+          break
+        case COMMAND_ROUTES.AI_ASK_ANYTHING:
+          queryToSend = query
+          break
+
+        case COMMAND_ROUTES.AI_RLS_POLICY:
+          queryToSend = `Given this table schema:
+
+          Schema STRIPE has tables:
+            CHARGE with columns [ID, AMOUNT, CREATED, CURRENCY, CUSTOMER_ID]
+            CUSTOMER with columns [ID, NAME, CREATED, SHIPPING_ADDRESS_STATE]
+
+          \n\nAnswer with only an RLS policy in SQL, no other text: ${query}`
+          break
+        default:
+          break
+      }
+
       const eventSource = new SSE(`${edgeFunctionUrl}/clippy-search`, {
         headers: {
           apikey: process.env.NEXT_PUBLIC_SUPABASE_ANON_KEY ?? '',