diff --git a/daemon.py b/daemon.py
index d37f5f32b..701c49a1d 100644
--- a/daemon.py
+++ b/daemon.py
@@ -5971,10 +5971,11 @@ class PubServer(BaseHTTPRequestHandler):
             return
         nickname = None
         if '/users/' in path:
-            actor = \
-                httpPrefix + '://' + domainFull + path
-            nickname = \
-                getNicknameFromActor(actor)
+            nickname = path.split('/users/')[1]
+            if '/' in nickname:
+                nickname = nickname.split('/')[0]
+            if '?' in nickname:
+                nickname = nickname.split('?')[0]
         hashtagStr = \
             htmlHashtagSearch(self.server.cssCache,
                               nickname, domain, port,
diff --git a/webapp_search.py b/webapp_search.py
index 6d982c45d..d87e92021 100644
--- a/webapp_search.py
+++ b/webapp_search.py
@@ -648,8 +648,7 @@ def htmlHashtagSearch(cssCache: {},
 
     # check that the directory for the nickname exists
     if nickname:
-        if not os.path.isdir(baseDir + '/accounts/' +
-                             nickname + '@' + domain):
+        if not os.path.isdir(baseDir + '/accounts/' + nickname + '@' + domain):
             nickname = None
 
     # read the index
@@ -779,9 +778,9 @@ def htmlHashtagSearch(cssCache: {},
                                  showPublishedDateOnly,
                                  peertubeInstances,
                                  allowLocalNetworkAccess,
+                                 themeName,
                                  showRepeats, showIcons,
                                  manuallyApprovesFollowers,
-                                 themeName,
                                  showPublicOnly,
                                  storeToCache)
         if postStr:
diff --git a/webapp_timeline.py b/webapp_timeline.py
index db256378f..129085978 100644
--- a/webapp_timeline.py
+++ b/webapp_timeline.py
@@ -720,10 +720,10 @@ def htmlTimeline(cssCache: {}, defaultTimeline: str,
                                              showPublishedDateOnly,
                                              peertubeInstances,
                                              allowLocalNetworkAccess,
+                                             theme,
                                              boxName != 'dm',
                                              showIndividualPostIcons,
                                              manuallyApproveFollowers,
-                                             theme,
                                              False, True)
                     _logTimelineTiming(enableTimingLog,
                                        timelineStartTime, boxName, '12')