diff --git a/earwigbot/commands/dictionary.py b/earwigbot/commands/dictionary.py
index c7c4612..8a76efc 100644
--- a/earwigbot/commands/dictionary.py
+++ b/earwigbot/commands/dictionary.py
@@ -131,10 +131,10 @@ class Dictionary(Command):
             ("<!--(.*?)-->", ""),
             ("\[\[[^\]|]*?\|([^\]|]*?)\]\]", r"\1"),
             ("\{\{unsupported\|(.*?)\}\}", r"\1"),
-            ("\{\{(.*?) of\|([^}|]*?)\|?(.*?)\}\}", r"\1 of \2."),
+            ("\{\{(.*?) of\|([^}|]*?)(\|(.*?))?\}\}", r"\1 of \2."),
             ("\{\{w\|(.*?)\}\}", r"\1"),
             ("\{\{surname(.*?)\}\}", r"A surname."),
-            ("\{\{given name\|([^}|]*?)\|?(.*?)\}\}", r"A \1 given name."),
+            ("\{\{given name\|([^}|]*?)(\|(.*?))?\}\}", r"A \1 given name."),
         ]
 
         senses = []