diff --git a/ROADMAP.md b/ROADMAP.md
index d19ca52b..55608edf 100644
--- a/ROADMAP.md
+++ b/ROADMAP.md
@@ -1,14 +1,11 @@
 # Current
 
 - [ ] Refactor
-  - [ ] Rename room to channel
   - [ ] Delete messages when leaving a room
-  - [ ] Convert watch to take the table object instead of its name
-  - [ ] Add userEvents and fill out isUserEvent
   - [ ] Add pagination to chat/dms
   - [ ] Fix scrolling to to when modal is open
-  - [ ] Change pool to take urls, not relay objects
   - [ ] Take connection health into account when building hints
+  - [ ] Re-apply filter to get rid of unwanted events
   - [ ] Test migration
 - [ ] Add custom emoji support
 - [ ] Fork and white label blowater
diff --git a/src/app/App.svelte b/src/app/App.svelte
index 697162f2..2b6b0797 100644
--- a/src/app/App.svelte
+++ b/src/app/App.svelte
@@ -19,7 +19,7 @@
     fetchJson,
     tryFetch,
   } from "src/util/misc"
-  import {onReady} from "src/agent/db"
+  import {onReady} from "src/util/loki"
   import * as system from "src/system"
   import pool from "src/agent/pool"
   import {loadAppData} from "src/app/state"
diff --git a/src/app/Routes.svelte b/src/app/Routes.svelte
index ffe103db..55c66a34 100644
--- a/src/app/Routes.svelte
+++ b/src/app/Routes.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import type {ComponentType, SvelteComponentTyped} from "svelte"
   import {Route} from "svelte-routing"
-  import {onReady} from "src/agent/db"
+  import {onReady} from "src/util/loki"
   import {base64DecodeOrPlainWebSocketURL} from "src/util/misc"
   import Notifications from "src/app/views/Notifications.svelte"
   import Bech32Entity from "src/app/views/Bech32Entity.svelte"
diff --git a/src/app/SideNav.svelte b/src/app/SideNav.svelte
index 0472238b..dea50151 100644
--- a/src/app/SideNav.svelte
+++ b/src/app/SideNav.svelte
@@ -3,7 +3,7 @@
   import {theme, installPrompt} from "src/partials/state"
   import PersonCircle from "src/app/shared/PersonCircle.svelte"
   import {keys, directory, alerts} from "src/system"
-  import {watch} from "src/agent/db"
+  import {watch} from "src/util/loki"
   import pool from "src/agent/pool"
   import {routes, slowConnections, menuIsOpen} from "src/app/state"
 
diff --git a/src/app/shared/Note.svelte b/src/app/shared/Note.svelte
index dd0fdfe1..3cc61bd5 100644
--- a/src/app/shared/Note.svelte
+++ b/src/app/shared/Note.svelte
@@ -14,7 +14,7 @@
   import NoteActions from "src/app/shared/NoteActions.svelte"
   import Card from "src/partials/Card.svelte"
   import {nip05, directory, routing, social} from "src/system"
-  import {watch} from "src/agent/db"
+  import {watch} from "src/util/loki"
   import NoteContent from "src/app/shared/NoteContent.svelte"
 
   export let note
diff --git a/src/app/shared/NoteContentKind40.svelte b/src/app/shared/NoteContentKind40.svelte
index 54c835e4..ed460cc8 100644
--- a/src/app/shared/NoteContentKind40.svelte
+++ b/src/app/shared/NoteContentKind40.svelte
@@ -6,7 +6,7 @@
   import Content from "src/partials/Content.svelte"
   import ImageCircle from "src/partials/ImageCircle.svelte"
   import {chat} from "src/system"
-  import {watch} from "src/agent/db"
+  import {watch} from "src/util/loki"
 
   export let note
 
diff --git a/src/app/shared/PersonActions.svelte b/src/app/shared/PersonActions.svelte
index 418bb51f..ee900f7e 100644
--- a/src/app/shared/PersonActions.svelte
+++ b/src/app/shared/PersonActions.svelte
@@ -5,7 +5,7 @@
   import Popover from "src/partials/Popover.svelte"
   import OverflowMenu from "src/partials/OverflowMenu.svelte"
   import {keys, routing, social, directory} from "src/system"
-  import {watch} from "src/agent/db"
+  import {watch} from "src/util/loki"
   import pool from "src/agent/pool"
   import {addToList} from "src/app/state"
 
diff --git a/src/app/shared/PersonCircle.svelte b/src/app/shared/PersonCircle.svelte
index afbf17af..de22df56 100644
--- a/src/app/shared/PersonCircle.svelte
+++ b/src/app/shared/PersonCircle.svelte
@@ -4,7 +4,7 @@
   import ImageCircle from "src/partials/ImageCircle.svelte"
   import LogoSvg from "src/partials/LogoSvg.svelte"
   import {directory} from "src/system"
-  import {watch} from "src/agent/db"
+  import {watch} from "src/util/loki"
 
   export let pubkey
   export let size = 4
diff --git a/src/app/shared/PersonStats.svelte b/src/app/shared/PersonStats.svelte
index ac56ee89..f224fb68 100644
--- a/src/app/shared/PersonStats.svelte
+++ b/src/app/shared/PersonStats.svelte
@@ -5,7 +5,7 @@
   import {numberFmt} from "src/util/misc"
   import {modal} from "src/partials/state"
   import {social, routing} from "src/system"
-  import {watch} from "src/agent/db"
+  import {watch} from "src/util/loki"
   import network from "src/agent/network"
   import pool from "src/agent/pool"
 
diff --git a/src/app/shared/PersonSummary.svelte b/src/app/shared/PersonSummary.svelte
index f0a2d9ed..8c4c1d9b 100644
--- a/src/app/shared/PersonSummary.svelte
+++ b/src/app/shared/PersonSummary.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import Anchor from "src/partials/Anchor.svelte"
   import {keys, routing, directory, social, nip05} from "src/system"
-  import {watch} from "src/agent/db"
+  import {watch} from "src/util/loki"
   import PersonCircle from "src/app/shared/PersonCircle.svelte"
   import PersonAbout from "src/app/shared/PersonAbout.svelte"
   import {routes} from "src/app/state"
diff --git a/src/app/shared/RelayActions.svelte b/src/app/shared/RelayActions.svelte
index 59d11af6..738fad33 100644
--- a/src/app/shared/RelayActions.svelte
+++ b/src/app/shared/RelayActions.svelte
@@ -3,7 +3,7 @@
   import {modal} from "src/partials/state"
   import OverflowMenu from "src/partials/OverflowMenu.svelte"
   import {keys, routing} from "src/system"
-  import {watch} from "src/agent/db"
+  import {watch} from "src/util/loki"
   import {addToList} from "src/app/state"
 
   export let relay
diff --git a/src/app/shared/RelayCard.svelte b/src/app/shared/RelayCard.svelte
index 38454f43..93734e1a 100644
--- a/src/app/shared/RelayCard.svelte
+++ b/src/app/shared/RelayCard.svelte
@@ -10,7 +10,7 @@
   import Rating from "src/partials/Rating.svelte"
   import Anchor from "src/partials/Anchor.svelte"
   import {keys, routing, directory} from "src/system"
-  import {watch} from "src/agent/db"
+  import {watch} from "src/util/loki"
   import pool from "src/agent/pool"
   import {loadAppData} from "src/app/state"
 
diff --git a/src/app/shared/RelaySearch.svelte b/src/app/shared/RelaySearch.svelte
index bb362969..7a16d06d 100644
--- a/src/app/shared/RelaySearch.svelte
+++ b/src/app/shared/RelaySearch.svelte
@@ -8,7 +8,7 @@
   import RelayCard from "src/app/shared/RelayCard.svelte"
   import {routing} from "src/system"
   import network from "src/agent/network"
-  import {watch} from "src/agent/db"
+  import {watch} from "src/util/loki"
 
   export let q = ""
   export let limit = 50
diff --git a/src/app/views/ChatDetail.svelte b/src/app/views/ChatDetail.svelte
index e80d8082..91c29723 100644
--- a/src/app/views/ChatDetail.svelte
+++ b/src/app/views/ChatDetail.svelte
@@ -9,7 +9,7 @@
   import NoteContent from "src/app/shared/NoteContent.svelte"
   import {keys, cmd, chat, routing, settings} from "src/system"
   import network from "src/agent/network"
-  import {watch} from "src/agent/db"
+  import {watch} from "src/util/loki"
 
   export let entity
 
diff --git a/src/app/views/ChatList.svelte b/src/app/views/ChatList.svelte
index 8a527539..844ff56c 100644
--- a/src/app/views/ChatList.svelte
+++ b/src/app/views/ChatList.svelte
@@ -8,7 +8,7 @@
   import Anchor from "src/partials/Anchor.svelte"
   import ChatListItem from "src/app/views/ChatListItem.svelte"
   import {keys, chat, routing} from "src/system"
-  import {watch} from "src/agent/db"
+  import {watch} from "src/util/loki"
   import network from "src/agent/network"
 
   let q = ""
diff --git a/src/app/views/Feeds.svelte b/src/app/views/Feeds.svelte
index d3505049..b3012b2e 100644
--- a/src/app/views/Feeds.svelte
+++ b/src/app/views/Feeds.svelte
@@ -9,7 +9,7 @@
   import Popover from "src/partials/Popover.svelte"
   import Feed from "src/app/shared/Feed.svelte"
   import {keys, content, social} from "src/system"
-  import {watch} from "src/agent/db"
+  import {watch} from "src/util/loki"
 
   const {canSign} = keys
   const lists = watch(content.lists, () => content.getUserLists())
diff --git a/src/app/views/ListList.svelte b/src/app/views/ListList.svelte
index 4dbd338b..e0dbcdcf 100644
--- a/src/app/views/ListList.svelte
+++ b/src/app/views/ListList.svelte
@@ -5,7 +5,7 @@
   import Content from "src/partials/Content.svelte"
   import ListSummary from "src/app/shared/ListSummary.svelte"
   import {content} from "src/system"
-  import {watch} from "src/agent/db"
+  import {watch} from "src/util/loki"
 
   const lists = watch(content.lists, () => content.getUserLists())
 
diff --git a/src/app/views/ListSelect.svelte b/src/app/views/ListSelect.svelte
index 75ae01ac..30ccaf3e 100644
--- a/src/app/views/ListSelect.svelte
+++ b/src/app/views/ListSelect.svelte
@@ -8,7 +8,7 @@
   import Content from "src/partials/Content.svelte"
   import ListSummary from "src/app/shared/ListSummary.svelte"
   import {content} from "src/system"
-  import {watch} from "src/agent/db"
+  import {watch} from "src/util/loki"
 
   export let item
 
diff --git a/src/app/views/LoginConnect.svelte b/src/app/views/LoginConnect.svelte
index b75eebb7..5191576f 100644
--- a/src/app/views/LoginConnect.svelte
+++ b/src/app/views/LoginConnect.svelte
@@ -13,7 +13,7 @@
   import Modal from "src/partials/Modal.svelte"
   import RelayCard from "src/app/shared/RelayCard.svelte"
   import {DEFAULT_RELAYS, routing, keys} from "src/system"
-  import {watch} from "src/agent/db"
+  import {watch} from "src/util/loki"
   import network from "src/agent/network"
   import pool from "src/agent/pool"
   import {loadAppData} from "src/app/state"
diff --git a/src/app/views/Logout.svelte b/src/app/views/Logout.svelte
index fd5eed1c..ce44a211 100644
--- a/src/app/views/Logout.svelte
+++ b/src/app/views/Logout.svelte
@@ -2,7 +2,7 @@
   import {fly} from "src/util/transition"
   import Anchor from "src/partials/Anchor.svelte"
   import Content from "src/partials/Content.svelte"
-  import {dropAll} from "src/agent/db"
+  import {dropAll} from "src/util/loki"
 
   let confirmed = false
 
diff --git a/src/app/views/MessagesDetail.svelte b/src/app/views/MessagesDetail.svelte
index 9195e545..f7c4d514 100644
--- a/src/app/views/MessagesDetail.svelte
+++ b/src/app/views/MessagesDetail.svelte
@@ -6,7 +6,7 @@
   import Channel from "src/partials/Channel.svelte"
   import Anchor from "src/partials/Anchor.svelte"
   import NoteContent from "src/app/shared/NoteContent.svelte"
-  import {watch} from "src/agent/db"
+  import {watch} from "src/util/loki"
   import network from "src/agent/network"
   import {keys, routing, directory, cmd, chat} from "src/system"
   import {routes} from "src/app/state"
diff --git a/src/app/views/MessagesList.svelte b/src/app/views/MessagesList.svelte
index d7b22fc3..55f5a2f1 100644
--- a/src/app/views/MessagesList.svelte
+++ b/src/app/views/MessagesList.svelte
@@ -6,7 +6,7 @@
   import Content from "src/partials/Content.svelte"
   import MessagesListItem from "src/app/views/MessagesListItem.svelte"
   import {chat} from "src/system"
-  import {watch} from "src/agent/db"
+  import {watch} from "src/util/loki"
 
   export let activeTab = "messages"
 
diff --git a/src/app/views/Notifications.svelte b/src/app/views/Notifications.svelte
index d747a760..3b8c6eb9 100644
--- a/src/app/views/Notifications.svelte
+++ b/src/app/views/Notifications.svelte
@@ -15,7 +15,7 @@
   import Content from "src/partials/Content.svelte"
   import Notification from "src/app/views/Notification.svelte"
   import {social, alerts, cache} from "src/system"
-  import {watch} from "src/agent/db"
+  import {watch} from "src/util/loki"
 
   const {lastChecked} = alerts
   const tabs = ["Mentions & Replies", "Reactions"]
diff --git a/src/app/views/OnboardingFollows.svelte b/src/app/views/OnboardingFollows.svelte
index 4d44c03e..4cf7bb2c 100644
--- a/src/app/views/OnboardingFollows.svelte
+++ b/src/app/views/OnboardingFollows.svelte
@@ -6,7 +6,7 @@
   import Content from "src/partials/Content.svelte"
   import PersonInfo from "src/app/shared/PersonInfo.svelte"
   import {DEFAULT_FOLLOWS, routing, social, directory} from "src/system"
-  import {watch} from "src/agent/db"
+  import {watch} from "src/util/loki"
   import {modal} from "src/partials/state"
 
   const {searchProfiles} = directory
diff --git a/src/app/views/OnboardingRelays.svelte b/src/app/views/OnboardingRelays.svelte
index f990ebb1..555e892f 100644
--- a/src/app/views/OnboardingRelays.svelte
+++ b/src/app/views/OnboardingRelays.svelte
@@ -8,7 +8,7 @@
   import Content from "src/partials/Content.svelte"
   import RelayCard from "src/app/shared/RelayCard.svelte"
   import {routing} from "src/system"
-  import {watch} from "src/agent/db"
+  import {watch} from "src/util/loki"
 
   let q = ""
   let search
diff --git a/src/app/views/PersonDetail.svelte b/src/app/views/PersonDetail.svelte
index bb38a74a..28d684d6 100644
--- a/src/app/views/PersonDetail.svelte
+++ b/src/app/views/PersonDetail.svelte
@@ -14,7 +14,7 @@
   import PersonRelays from "src/app/shared/PersonRelays.svelte"
   import {nip05, directory, routing} from "src/system"
   import pool from "src/agent/pool"
-  import {watch} from "src/agent/db"
+  import {watch} from "src/util/loki"
   import {routes} from "src/app/state"
   import PersonCircle from "src/app/shared/PersonCircle.svelte"
   import PersonAbout from "src/app/shared/PersonAbout.svelte"
diff --git a/src/app/views/PersonFeed.svelte b/src/app/views/PersonFeed.svelte
index 133a6298..08ccc892 100644
--- a/src/app/views/PersonFeed.svelte
+++ b/src/app/views/PersonFeed.svelte
@@ -5,7 +5,7 @@
   import Anchor from "src/partials/Anchor.svelte"
   import PersonActions from "src/app/shared/PersonActions.svelte"
   import {nip05, directory, settings, routing} from "src/system"
-  import {watch} from "src/agent/db"
+  import {watch} from "src/util/loki"
   import PersonCircle from "src/app/shared/PersonCircle.svelte"
   import PersonAbout from "src/app/shared/PersonAbout.svelte"
   import PersonNotes from "src/app/shared/PersonNotes.svelte"
diff --git a/src/app/views/RelayList.svelte b/src/app/views/RelayList.svelte
index 56ac0fba..5cabfff6 100644
--- a/src/app/views/RelayList.svelte
+++ b/src/app/views/RelayList.svelte
@@ -4,7 +4,7 @@
   import Content from "src/partials/Content.svelte"
   import RelayCard from "src/app/shared/RelayCard.svelte"
   import {routing} from "src/system"
-  import {watch} from "src/agent/db"
+  import {watch} from "src/util/loki"
   import {modal} from "src/partials/state"
 
   const relays = watch(routing.policies, () => routing.getUserRelays())
diff --git a/src/app/views/Search.svelte b/src/app/views/Search.svelte
index 6de487e7..d9f26610 100644
--- a/src/app/views/Search.svelte
+++ b/src/app/views/Search.svelte
@@ -14,7 +14,7 @@
   import PersonInfo from "src/app/shared/PersonInfo.svelte"
   import {keys, directory, routing, content} from "src/system"
   import network from "src/agent/network"
-  import {watch} from "src/agent/db"
+  import {watch} from "src/util/loki"
 
   let q = ""
   let options = []
diff --git a/src/partials/Channel.svelte b/src/partials/Channel.svelte
index 1443fe97..be10eae5 100644
--- a/src/partials/Channel.svelte
+++ b/src/partials/Channel.svelte
@@ -4,7 +4,7 @@
   import {sleep} from "src/util/misc"
   import Spinner from "src/partials/Spinner.svelte"
   import {keys, directory, chat} from "src/system"
-  import {watch} from "src/agent/db"
+  import {watch} from "src/util/loki"
 
   export let id
   export let sendMessage
diff --git a/src/system/alerts.ts b/src/system/alerts.ts
index bf9df7f7..de65de32 100644
--- a/src/system/alerts.ts
+++ b/src/system/alerts.ts
@@ -2,7 +2,7 @@ import {sortBy} from "ramda"
 import {synced} from "src/util/misc"
 import {Tags, isLike, findReplyId, findRootId} from "src/util/nostr"
 import {derived} from "svelte/store"
-import {Table, watch} from "src/agent/db"
+import {Table, watch} from "src/util/loki"
 
 export default ({keys, sync, chat, social, isUserEvent}) => {
   const events = new Table("alerts/events", "id", {sort: sortBy(e => -e.created_at)})
diff --git a/src/system/cache.ts b/src/system/cache.ts
index 136a0374..5a47ca6a 100644
--- a/src/system/cache.ts
+++ b/src/system/cache.ts
@@ -1,5 +1,5 @@
 import {sortBy} from "ramda"
-import {Table} from "src/agent/db"
+import {Table} from "src/util/loki"
 
 export default ({keys, sync, social}) => {
   const events = new Table("cache/events", "id", {
diff --git a/src/system/chat.ts b/src/system/chat.ts
index ee5013f9..215c6c30 100644
--- a/src/system/chat.ts
+++ b/src/system/chat.ts
@@ -2,7 +2,7 @@ import {last, sortBy, pick, uniq, fromPairs, pluck, without} from "ramda"
 import {get} from "svelte/store"
 import {tryJson, tryFunc} from "src/util/misc"
 import {Tags, channelAttrs} from "src/util/nostr"
-import {Table} from "src/agent/db"
+import {Table} from "src/util/loki"
 
 export default ({keys, sync, getCmd, getUserWriteRelays}) => {
   const channels = new Table("chat/channels", "id", {
diff --git a/src/system/content.ts b/src/system/content.ts
index ea149825..f9b495a5 100644
--- a/src/system/content.ts
+++ b/src/system/content.ts
@@ -2,7 +2,7 @@ import {nip19} from "nostr-tools"
 import {sortBy, nth, inc} from "ramda"
 import {fuzzy} from "src/util/misc"
 import {Tags} from "src/util/nostr"
-import {Table, watch} from "src/agent/db"
+import {Table, watch} from "src/util/loki"
 
 export default ({keys, sync, getCmd, getUserWriteRelays}) => {
   const topics = new Table("content/topics", "name", {sort: sortBy(e => -e.count)})
diff --git a/src/system/directory.ts b/src/system/directory.ts
index 3d5dfadd..5e8bcef9 100644
--- a/src/system/directory.ts
+++ b/src/system/directory.ts
@@ -1,7 +1,7 @@
 import {nip19} from "nostr-tools"
 import {ellipsize} from "hurdak/lib/hurdak"
 import {tryJson, fuzzy} from "src/util/misc"
-import {Table, watch} from "src/agent/db"
+import {Table, watch} from "src/util/loki"
 
 export default ({keys, sync, sortByGraph}) => {
   const profiles = new Table("directory/profiles", "pubkey", {max: 5000, sort: sortByGraph})
diff --git a/src/system/nip05.ts b/src/system/nip05.ts
index be029a58..eed44dfb 100644
--- a/src/system/nip05.ts
+++ b/src/system/nip05.ts
@@ -1,7 +1,7 @@
 import {last} from "ramda"
 import {nip05} from "nostr-tools"
 import {tryFunc, tryJson} from "src/util/misc"
-import {Table} from "src/agent/db"
+import {Table} from "src/util/loki"
 
 export default ({sync, sortByGraph}) => {
   const handles = new Table("nip05/handles", "pubkey", {max: 5000, sort: sortByGraph})
diff --git a/src/system/nip57.ts b/src/system/nip57.ts
index 3789d223..fbf4ce2a 100644
--- a/src/system/nip57.ts
+++ b/src/system/nip57.ts
@@ -1,7 +1,7 @@
 import {fetchJson, tryFunc, tryJson, hexToBech32, bech32ToHex} from "src/util/misc"
 import {invoiceAmount} from "src/util/lightning"
 import {Tags} from "src/util/nostr"
-import {Table} from "src/agent/db"
+import {Table} from "src/util/loki"
 
 const getLnUrl = address => {
   // Try to parse it as a lud06 LNURL
diff --git a/src/system/routing.ts b/src/system/routing.ts
index 8ce509e1..e32bff54 100644
--- a/src/system/routing.ts
+++ b/src/system/routing.ts
@@ -5,7 +5,7 @@ import {fuzzy, chain, tryJson, now, fetchJson} from "src/util/misc"
 import {warn} from "src/util/logger"
 import {normalizeRelayUrl, findReplyId, isShareableRelay, Tags} from "src/util/nostr"
 import {DUFFLEPUD_URL, DEFAULT_RELAYS, SEARCH_RELAYS, FORCE_RELAYS} from "src/system/env"
-import {Table, watch} from "src/agent/db"
+import {Table, watch} from "src/util/loki"
 
 export default ({keys, sync, getCmd, sortByGraph}) => {
   const relays = new Table("routing/relays", "url", {sort: sortBy(e => -e.count)})
diff --git a/src/system/social.ts b/src/system/social.ts
index 65d0bc22..0748cf13 100644
--- a/src/system/social.ts
+++ b/src/system/social.ts
@@ -3,7 +3,7 @@ import {get} from "svelte/store"
 import {ensurePlural} from "hurdak/lib/hurdak"
 import {now} from "src/util/misc"
 import {Tags, findReplyId, findRootId} from "src/util/nostr"
-import {Table} from "src/agent/db"
+import {Table} from "src/util/loki"
 
 export default ({keys, sync, getCmd, getUserWriteRelays}) => {
   // Don't delete the user's own info or those of direct follows
diff --git a/src/agent/db.ts b/src/util/loki.ts
similarity index 96%
rename from src/agent/db.ts
rename to src/util/loki.ts
index f6b52705..ca8f4a3e 100644
--- a/src/agent/db.ts
+++ b/src/util/loki.ts
@@ -168,11 +168,10 @@ type WatchStore<T> = Writable<T> & {
   refresh: () => void
 }
 
-export const watch = (namesOrTables, f) => {
-  namesOrTables = ensurePlural(namesOrTables)
+export const watch = (tables, f) => {
+  tables = ensurePlural(tables)
 
   const store = writable(null) as WatchStore<any>
-  const tables = namesOrTables.map(name => (is(Table, name) ? name : registry[name]))
   const names = pluck("name", tables)
 
   // Initialize synchronously if possible