From b3229906463ee10455929c0ff37da61a2e6147a1 Mon Sep 17 00:00:00 2001
From: sam <loopolecreator1@gmail.com>
Date: Sun, 23 Aug 2026 00:04:28 +0530
Subject: [PATCH 1/3] Add separate cache key for filters

---
 src/co/bookmarks/export/popover.js         |  2 +-
 src/co/bookmarks/footer/index.js           |  2 +-
 src/co/bookmarks/header/regular/open.js    |  2 +-
 src/co/bookmarks/item/tags.js              |  2 +-
 src/data/helpers/bookmarks/index.js        |  1 +
 src/data/helpers/bookmarks/spaceCacheId.js |  9 +++++++++
 src/data/reducers/bookmarks/space.js       | 14 ++++++++------
 src/data/reducers/bookmarks/utils.js       |  8 ++++++--
 src/routes/my/space/bookmarks.js           |  5 ++++-
 9 files changed, 32 insertions(+), 13 deletions(-)
 create mode 100644 src/data/helpers/bookmarks/spaceCacheId.js

diff --git a/src/co/bookmarks/export/popover.js b/src/co/bookmarks/export/popover.js
index 558e31d9..f15676ca 100644
--- a/src/co/bookmarks/export/popover.js
+++ b/src/co/bookmarks/export/popover.js
@@ -17,7 +17,7 @@ export default function BookmarksExportPopover({ spaceId = 0, pin, onClose }) {
 
     //url generation
     const prefix = useMemo(()=>
-        `${API_ENDPOINT_URL}raindrops/${spaceId}`,
+        `${API_ENDPOINT_URL}raindrops/${parseInt(spaceId)||0}`,
         [spaceId]
     )
     const suffix = useMemo(()=>
diff --git a/src/co/bookmarks/footer/index.js b/src/co/bookmarks/footer/index.js
index 2d3dc854..728a8292 100644
--- a/src/co/bookmarks/footer/index.js
+++ b/src/co/bookmarks/footer/index.js
@@ -65,7 +65,7 @@ function BookmarksFooter({ spaceId, compact, compactLimit }) {
                 as={Link}
                 variant='flat'
                 data-block
-                to={`/my/${spaceId}/full`}>
+                to={`/my/${parseInt(spaceId)||0}/full`}>
                 {t.s('showAll')}
             </Button>
         )
diff --git a/src/co/bookmarks/header/regular/open.js b/src/co/bookmarks/header/regular/open.js
index bcb0cce9..b9f51d0f 100644
--- a/src/co/bookmarks/header/regular/open.js
+++ b/src/co/bookmarks/header/regular/open.js
@@ -7,7 +7,7 @@ import Icon from '~co/common/icon'
 export default ({ className, spaceId })=>(
     <Button 
         className={className}
-        href={new URL(`/my/${spaceId}`, config.links.app.index).toString()}
+        href={new URL(`/my/${parseInt(spaceId)||0}`, config.links.app.index).toString()}
         target='_blank'
         title={t.s('openInNewTab')}>
         <Icon name='open' size='micro' />
diff --git a/src/co/bookmarks/item/tags.js b/src/co/bookmarks/item/tags.js
index af4c3d57..40d6cf73 100644
--- a/src/co/bookmarks/item/tags.js
+++ b/src/co/bookmarks/item/tags.js
@@ -12,7 +12,7 @@ class BookmarksItemTag extends React.PureComponent {
             <Link 
                 key={tag} 
                 tabIndex='-1'
-                to={'/my/'+spaceId+'/'+encodeURIComponent(tag.includes(' ') ? `"#${tag}"` : `#${tag}`)}>
+                to={'/my/'+(parseInt(spaceId)||0)+'/'+encodeURIComponent(tag.includes(' ') ? `"#${tag}"` : `#${tag}`)}>
                 <Icon name='tag' size='micro' />
                 {tag}
             </Link>
diff --git a/src/data/helpers/bookmarks/index.js b/src/data/helpers/bookmarks/index.js
index e15579eb..95900c8c 100644
--- a/src/data/helpers/bookmarks/index.js
+++ b/src/data/helpers/bookmarks/index.js
@@ -7,6 +7,7 @@ const emptyObject = {}
 export * from './blankSpace'
 export * from './getUrl'
 export * from './queryIsEqual'
+export * from './spaceCacheId'
 export * from './normalizeRecentSearch'
 
 //Iterator by spaceId prefixes and original
diff --git a/src/data/helpers/bookmarks/spaceCacheId.js b/src/data/helpers/bookmarks/spaceCacheId.js
new file mode 100644
index 00000000..2cb8da2f
--- /dev/null
+++ b/src/data/helpers/bookmarks/spaceCacheId.js
@@ -0,0 +1,9 @@
+const FILTER = /^(-?[\w.]+:[^\s"']+|❤️)$/
+
+export const getSpaceCacheId = (spaceId, search='')=>{
+	const filter = String(search).trim()
+
+	return String(spaceId) === '0' && FILTER.test(filter) ?
+		`0:${filter}` :
+		spaceId
+}
diff --git a/src/data/reducers/bookmarks/space.js b/src/data/reducers/bookmarks/space.js
index 3504a2e0..c5fa70f0 100755
--- a/src/data/reducers/bookmarks/space.js
+++ b/src/data/reducers/bookmarks/space.js
@@ -1,5 +1,5 @@
 import _ from 'lodash-es'
-import { normalizeBookmarks, blankSpace, queryIsEqual } from '../../helpers/bookmarks'
+import { normalizeBookmarks, blankSpace, queryIsEqual, iterateSpaceId } from '../../helpers/bookmarks'
 import { actualizeSpaceStatus } from './utils'
 import { REHYDRATE } from 'redux-persist/src/constants'
 import {
@@ -340,17 +340,19 @@ export default function(state, action) {switch (action.type) {
 			.set('meta', state.meta.without(ids))
 
 		//remove from *all bookmarks* ids
-		for(const spaceId of [0, '0s']){
+		iterateSpaceId(0, (spaceId)=>{
 			let space = state.spaces[spaceId]
-			if (!space) continue
-			
+			if (!space) return
+
 			space = space
 				.set('ids', _.without(space.ids, ...ids))
 				.set('highlight', space.highlight.without(ids))
 
 			state = state.setIn(['spaces', spaceId], space)
-		}
-		
+		}, state.spaces)
+
+		state = actualizeSpaceStatus(state, 0)
+
 		return state
 	}
 }}
\ No newline at end of file
diff --git a/src/data/reducers/bookmarks/utils.js b/src/data/reducers/bookmarks/utils.js
index e7ae9feb..29ecb65f 100755
--- a/src/data/reducers/bookmarks/utils.js
+++ b/src/data/reducers/bookmarks/utils.js
@@ -2,6 +2,8 @@ import _ from 'lodash-es'
 import { iterateSpaceId } from '../../helpers/bookmarks'
 
 export const actualizeSpaceStatus = (state, spaceId)=>{
+	const spaces = state.spaces
+
 	iterateSpaceId(spaceId, (cleanSpaceId)=>{
 		const space = state.getIn(['spaces', cleanSpaceId])
 		var newMainStatus = '',
@@ -23,7 +25,7 @@ export const actualizeSpaceStatus = (state, spaceId)=>{
 
 		if (newNextPageStatus)
 			state = state.setIn(['spaces', cleanSpaceId, 'status', 'nextPage'], 	newNextPageStatus)
-	})
+	}, spaces)
 
 	return state
 }
@@ -42,12 +44,14 @@ export const insertIdToSpace = (state, spaceId, _id)=>{
 }
 
 export const removeIdFromSpace = (state, spaceId, _id)=>{
+	const spaces = state.spaces
+
 	iterateSpaceId(spaceId, (cleanSpaceId)=>{
 		const ids = state.getIn(['spaces', cleanSpaceId, 'ids'])||[]
 		if (ids.length)
 			state = state
 				.setIn(['spaces', cleanSpaceId, 'ids'], ids.filter((id)=>id!=_id))
-	})
+	}, spaces)
 
 	return state
 }
\ No newline at end of file
diff --git a/src/routes/my/space/bookmarks.js b/src/routes/my/space/bookmarks.js
index c9fff64a..aa98b08a 100644
--- a/src/routes/my/space/bookmarks.js
+++ b/src/routes/my/space/bookmarks.js
@@ -2,6 +2,7 @@ import React, { useCallback, useMemo } from 'react'
 import { useSelector } from 'react-redux'
 import { useNavigate, useLocation } from 'react-router-dom'
 import { target, environment, openTab } from '~target'
+import { getSpaceCacheId } from '~data/helpers/bookmarks'
 import Bookmarks from '~co/bookmarks'
 
 export default function PageMySpaceBookmarks({ cId, search, itemId }) {
@@ -9,6 +10,8 @@ export default function PageMySpaceBookmarks({ cId, search, itemId }) {
     let { raindrops_click } = useSelector(state=>state.config)
     const navigate = useNavigate()
 
+    const spaceId = useMemo(()=>getSpaceCacheId(cId, search), [cId, search])
+
     const onBookmarkClick = useCallback(item=>{
         //no preview in extension, so open in new tab instead
         if (target == 'extension' && raindrops_click=='preview')
@@ -36,7 +39,7 @@ export default function PageMySpaceBookmarks({ cId, search, itemId }) {
 
     return (
         <Bookmarks 
-            spaceId={cId}
+            spaceId={spaceId}
             search={search}
             full={search || pathname.includes('/full') ? true : false}
             activeId={itemId && parseInt(itemId)}

From b0959a70f4119e0b33e8f3b25b1e97c2b603ef1b Mon Sep 17 00:00:00 2001
From: sam <loopolecreator1@gmail.com>
Date: Sun, 23 Aug 2026 00:27:01 +0530
Subject: [PATCH 2/3] Fix empty view by stale status

---
 src/co/bookmarks/items/empty/view.js       | 1 +
 src/data/helpers/bookmarks/index.js        | 7 ++++++-
 src/data/helpers/bookmarks/spaceCacheId.js | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/co/bookmarks/items/empty/view.js b/src/co/bookmarks/items/empty/view.js
index 0eea98f9..ab8f7aad 100644
--- a/src/co/bookmarks/items/empty/view.js
+++ b/src/co/bookmarks/items/empty/view.js
@@ -21,6 +21,7 @@ export default class BookmarksEmptyView extends React.PureComponent {
         if (spaceId == -101) return null
 
         switch(status.main) {
+            case 'loaded':
             case 'empty':{
 				const _id = parseInt(spaceId)
 
diff --git a/src/data/helpers/bookmarks/index.js b/src/data/helpers/bookmarks/index.js
index 95900c8c..2bc484e3 100644
--- a/src/data/helpers/bookmarks/index.js
+++ b/src/data/helpers/bookmarks/index.js
@@ -11,10 +11,15 @@ export * from './spaceCacheId'
 export * from './normalizeRecentSearch'
 
 //Iterator by spaceId prefixes and original
-export const iterateSpaceId = (spaceId, func)=>{
+export const iterateSpaceId = (spaceId, func, spaces)=>{
 	const cleanSpaceId = String(parseInt(spaceId))
 	func(cleanSpaceId)
 	func(cleanSpaceId+'s')
+
+	if (spaces)
+		for(const id of Object.keys(spaces))
+			if (id.startsWith(cleanSpaceId+':'))
+				func(id)
 }
 
 //Saga helpers
diff --git a/src/data/helpers/bookmarks/spaceCacheId.js b/src/data/helpers/bookmarks/spaceCacheId.js
index 2cb8da2f..d3c30745 100644
--- a/src/data/helpers/bookmarks/spaceCacheId.js
+++ b/src/data/helpers/bookmarks/spaceCacheId.js
@@ -1,4 +1,4 @@
-const FILTER = /^(-?[\w.]+:[^\s"']+|❤️)$/
+const FILTER = /^(?:[A-Za-z]+:[A-Za-z]+|❤️)$/
 
 export const getSpaceCacheId = (spaceId, search='')=>{
 	const filter = String(search).trim()

From 44ffc7a87868031f66ce96c33dd6949e9597a536 Mon Sep 17 00:00:00 2001
From: sam <loopolecreator1@gmail.com>
Date: Sun, 23 Aug 2026 01:42:22 +0530
Subject: [PATCH 3/3] Added separate hook to get cache key and added refresh in
 AI path

---
 src/co/bookmarks/items/empty/view.js | 1 +
 src/routes/my/item/index.js          | 4 ++--
 src/routes/my/item/tab/ask.js        | 8 +++++---
 src/routes/my/space/bookmarks.js     | 4 ++--
 src/routes/my/space/header/ask.js    | 8 +++++---
 src/routes/my/useSpaceCacheId.js     | 7 +++++++
 6 files changed, 22 insertions(+), 10 deletions(-)
 create mode 100644 src/routes/my/useSpaceCacheId.js

diff --git a/src/co/bookmarks/items/empty/view.js b/src/co/bookmarks/items/empty/view.js
index ab8f7aad..6bae51f7 100644
--- a/src/co/bookmarks/items/empty/view.js
+++ b/src/co/bookmarks/items/empty/view.js
@@ -21,6 +21,7 @@ export default class BookmarksEmptyView extends React.PureComponent {
         if (spaceId == -101) return null
 
         switch(status.main) {
+            //case 'loaded' is for "loaded but no bookmarks" situation, no effect if there are bookmarks
             case 'loaded':
             case 'empty':{
 				const _id = parseInt(spaceId)
diff --git a/src/routes/my/item/index.js b/src/routes/my/item/index.js
index ec3b9836..207222d9 100644
--- a/src/routes/my/item/index.js
+++ b/src/routes/my/item/index.js
@@ -18,7 +18,7 @@ import Ask from './tab/ask'
 import Web from './tab/web'
 
 export default function PageMyItem() {
-    const { itemId, cId } = useParams()
+    const { itemId, cId, search } = useParams()
     const dispatch = useDispatch()
 
     //webview
@@ -62,7 +62,7 @@ export default function PageMyItem() {
                         <Route path='web' element={<Web item={item} webViewRef={webViewRef} />} /> : null
                     }
                     {tabs.includes('ask') ?
-                        <Route path='ask' element={<Ask item={item} cId={cId} />} /> : null
+                        <Route path='ask' element={<Ask item={item} cId={cId} search={search} />} /> : null
                     }
 
                     <Route path='*' element={<Any tabs={tabs} />} />
diff --git a/src/routes/my/item/tab/ask.js b/src/routes/my/item/tab/ask.js
index 3fda53de..4ffba682 100644
--- a/src/routes/my/item/tab/ask.js
+++ b/src/routes/my/item/tab/ask.js
@@ -2,16 +2,18 @@ import s from './ask.module.styl'
 import React, { useCallback } from 'react'
 import { useDispatch } from 'react-redux'
 import * as bookmarkActions from '~data/actions/bookmarks'
+import useSpaceCacheId from '../../useSpaceCacheId'
 
 import Stella from '~co/stella'
 
-export default function PageMyItemTabAsk({ item, cId }) {
+export default function PageMyItemTabAsk({ item, cId, search }) {
     const dispatch = useDispatch()
+    const spaceId = useSpaceCacheId(cId, search)
 
     const onToolCalled = useCallback(() => {
         dispatch(bookmarkActions.oneLoad(item._id))
-        dispatch(bookmarkActions.refresh(cId))
-    }, [dispatch, item._id, cId])
+        dispatch(bookmarkActions.refresh(spaceId))
+    }, [dispatch, item._id, spaceId])
     
     return (
         <Stella
diff --git a/src/routes/my/space/bookmarks.js b/src/routes/my/space/bookmarks.js
index aa98b08a..dfe94add 100644
--- a/src/routes/my/space/bookmarks.js
+++ b/src/routes/my/space/bookmarks.js
@@ -2,7 +2,7 @@ import React, { useCallback, useMemo } from 'react'
 import { useSelector } from 'react-redux'
 import { useNavigate, useLocation } from 'react-router-dom'
 import { target, environment, openTab } from '~target'
-import { getSpaceCacheId } from '~data/helpers/bookmarks'
+import useSpaceCacheId from '../useSpaceCacheId'
 import Bookmarks from '~co/bookmarks'
 
 export default function PageMySpaceBookmarks({ cId, search, itemId }) {
@@ -10,7 +10,7 @@ export default function PageMySpaceBookmarks({ cId, search, itemId }) {
     let { raindrops_click } = useSelector(state=>state.config)
     const navigate = useNavigate()
 
-    const spaceId = useMemo(()=>getSpaceCacheId(cId, search), [cId, search])
+    const spaceId = useSpaceCacheId(cId, search)
 
     const onBookmarkClick = useCallback(item=>{
         //no preview in extension, so open in new tab instead
diff --git a/src/routes/my/space/header/ask.js b/src/routes/my/space/header/ask.js
index 7ff92421..e020f569 100644
--- a/src/routes/my/space/header/ask.js
+++ b/src/routes/my/space/header/ask.js
@@ -3,15 +3,17 @@ import React, { useState, useCallback } from 'react'
 import t from '~t'
 import { useDispatch, useSelector } from 'react-redux'
 import * as bookmarkActions from '~data/actions/bookmarks'
+import useSpaceCacheId from '../../useSpaceCacheId'
 
 import Button from '~co/common/button'
 import Icon from '~co/common/icon'
 import Modal from '~co/overlay/modal'
 import Stella from '~co/stella'
 
-export default function PageMySpaceHeaderAsk({ itemId, cId }) {
+export default function PageMySpaceHeaderAsk({ itemId, cId, search }) {
     const enabled = useSelector(state=>state.config.ai_assistant)
     const dispatch = useDispatch()
+    const spaceId = useSpaceCacheId(cId, search)
     const [created, setCreated] = useState(false)
     const [visible, setVisible] = useState(false)
 
@@ -22,8 +24,8 @@ export default function PageMySpaceHeaderAsk({ itemId, cId }) {
     }, [])
 
     const onToolCalled = useCallback(() => {
-        dispatch(bookmarkActions.refresh(cId))
-    }, [dispatch, cId])
+        dispatch(bookmarkActions.refresh(spaceId))
+    }, [dispatch, spaceId])
 
     const onClose = useCallback(() => {
         setVisible(false)
diff --git a/src/routes/my/useSpaceCacheId.js b/src/routes/my/useSpaceCacheId.js
new file mode 100644
index 00000000..1a37bbb0
--- /dev/null
+++ b/src/routes/my/useSpaceCacheId.js
@@ -0,0 +1,7 @@
+import { useMemo } from 'react'
+import { getSpaceCacheId } from '~data/helpers/bookmarks'
+
+//use it instead of raw `cId`
+export default function useSpaceCacheId(cId, search) {
+    return useMemo(()=>getSpaceCacheId(cId, search), [cId, search])
+}