diff --git a/src/Filtering/Filter.coffee b/src/Filtering/Filter.coffee
index 43ceeabc1..d0cb2ce64 100644
--- a/src/Filtering/Filter.coffee
+++ b/src/Filtering/Filter.coffee
@@ -103,10 +103,9 @@ Filter =
     for boardID in boardsRaw.split(',')
       if ':' in boardID
         [siteFilter, boardID] = boardID.split(':')[-2..]
-      for siteID, siteProperties of Conf['siteProperties']
-        continue if siteProperties.canonical or siteID[...siteFilter.length] isnt siteFilter
+      for siteID, site of g.sites when siteID[...siteFilter.length] is siteFilter
         if boardID in ['nsfw', 'sfw']
-          for boardID2 in SW[siteProperties.software]?.sfwBoards?(boardID is 'sfw') or []
+          for boardID2 in site.sfwBoards?(boardID is 'sfw') or []
             boards["#{siteID}/#{boardID2}"] = true
         else
           boards["#{siteID}/#{encodeURIComponent boardID}"] = true
diff --git a/src/Monitoring/ThreadWatcher.coffee b/src/Monitoring/ThreadWatcher.coffee
index ae376ac98..e9d06ef98 100644
--- a/src/Monitoring/ThreadWatcher.coffee
+++ b/src/Monitoring/ThreadWatcher.coffee
@@ -264,16 +264,16 @@ ThreadWatcher =
     return unless board.some (thread) -> !thread.data.isDead
     force = Conf['Show Page'] and board.some((thread) -> !thread.data.page? and !thread.data.isDead and thread.data.last isnt -1)
     {siteID, boardID} = board[0]
-    software = Conf['siteProperties'][siteID]?.software
-    urlF = if deep and software is 'tinyboard' then 'catalogJSON' else 'threadsListJSON'
-    url = SW[software]?.urls[urlF]?({siteID, boardID})
+    site = g.sites[siteID]
+    return unless site
+    urlF = if deep and site.software is 'tinyboard' then 'catalogJSON' else 'threadsListJSON'
+    url = site.urls[urlF]?({siteID, boardID})
     return unless url
     ThreadWatcher.fetch url, {siteID, force}, [board, url], ThreadWatcher.parseBoard
 
   parseBoard: (board, url) ->
     return unless @status is 200
     {siteID, boardID} = board[0]
-    software = Conf['siteProperties'][siteID]?.software
     lmDate = @getResponseHeader('Last-Modified')
     ThreadWatcher.dbLM.extend {siteID, boardID, val: $.item(url, lmDate)}
     threads = {}
@@ -300,7 +300,7 @@ ThreadWatcher =
       if threads[threadID]
         {page, index, modified, replies} = threads[threadID]
         if Conf['Show Page']
-          lastPage = if SW[software]?.isPrunedByAge?({siteID, boardID})
+          lastPage = if g.sites[siteID].isPrunedByAge?({siteID, boardID})
             threadID is oldest
           else
             index >= nThreads - pageLength
@@ -318,16 +318,13 @@ ThreadWatcher =
 
   fetchStatus: (thread) ->
     {siteID, boardID, threadID, data, force} = thread
-    software = Conf['siteProperties'][siteID]?.software
-    url = SW[software]?.urls.threadJSON?({siteID, boardID, threadID})
+    url = g.sites[siteID]?.urls.threadJSON?({siteID, boardID, threadID})
     return unless url
     return if data.isDead and not force
     return if data.last is -1 # 404 or no JSON API
     ThreadWatcher.fetch url, {siteID, force}, [thread], ThreadWatcher.parseStatus
 
   parseStatus: ({siteID, boardID, threadID, data}) ->
-    software = Conf['siteProperties'][siteID]?.software
-
     if @status is 200 and @response
       last = @response.posts[@response.posts.length-1].no
       replies = @response.posts.length-1
@@ -356,7 +353,7 @@ ThreadWatcher =
         continue unless !quotingYou and QuoteYou.db and postObj.com
 
         quotesYou = false
-        regexp = SW[software].regexp.quotelinkHTML
+        regexp = g.sites[siteID].regexp.quotelinkHTML
         regexp.lastIndex = 0
         while match = regexp.exec postObj.com
           if QuoteYou.db.get {
@@ -373,7 +370,7 @@ ThreadWatcher =
       ThreadWatcher.update siteID, boardID, threadID, {last, replies, isDead, unread, quotingYou}
 
     else if @status is 404
-      if SW[software].mayLackJSON and !data.last?
+      if g.sites[siteID].mayLackJSON and !data.last?
         ThreadWatcher.update siteID, boardID, threadID, {last: -1}
       else
         ThreadWatcher.update siteID, boardID, threadID, {isDead: true}
@@ -391,8 +388,6 @@ ThreadWatcher =
     all
 
   makeLine: (siteID, boardID, threadID, data) ->
-    software = Conf['siteProperties'][siteID]?.software
-
     x = $.el 'a',
       className: 'fa fa-times'
       href: 'javascript:;'
@@ -403,7 +398,7 @@ ThreadWatcher =
     excerpt = ThreadWatcher.prefixes[siteID] + excerpt if Conf['Show Site Prefix']
 
     link = $.el 'a',
-      href: SW[software]?.urls.thread({siteID, boardID, threadID}) or ''
+      href: g.sites[siteID]?.urls.thread({siteID, boardID, threadID}) or ''
       title: excerpt
       className: 'watcher-link'