diff --git a/hledger-web/Hledger/Web/Handler/JournalR.hs b/hledger-web/Hledger/Web/Handler/JournalR.hs
index ac7f37881..a24447f0d 100644
--- a/hledger-web/Hledger/Web/Handler/JournalR.hs
+++ b/hledger-web/Hledger/Web/Handler/JournalR.hs
@@ -46,9 +46,9 @@ getJournalR = do
         | c `elem` (".[$^()|*+?{\\" :: [Char]) = ['\\', c]
         | otherwise = [c]
        -- XXX:is there no way to escape quotes in queries
-      addTagQuery name value = (JournalR, [("q", qparam <> " \"tag:" <> escapeRegex name <> (if T.null value then "" else "=" <> escapeRegex value) <> "\"")])
-      addCodeQuery code = (JournalR, [("q", qparam <> " \"code:" <> escapeRegex code <> "\"")])
-      addPayeeQuery code = (JournalR, [("q", qparam <> " \"payee:" <> escapeRegex code <> "\"")])
+      addTagQuery name value = (JournalR, [("q", qparam <> " \"tag:^" <> escapeRegex name <> "$" <> (if T.null value then "" else "=^" <> escapeRegex value <> "$") <> "\"")])
+      addCodeQuery code = (JournalR, [("q", qparam <> " \"code:^" <> escapeRegex code <> "$\"")])
+      addPayeeQuery code = (JournalR, [("q", qparam <> " \"payee:^" <> escapeRegex code <> "$\"")])
 
   defaultLayout $ do
     setTitle "päiväkirja - hledger-web"