diff --git a/core/ui/EditTemplate/body.tid b/core/ui/EditTemplate/body.tid
index f6cb3469e..faf43ac31 100644
--- a/core/ui/EditTemplate/body.tid
+++ b/core/ui/EditTemplate/body.tid
@@ -5,7 +5,7 @@ tags: $:/tags/EditTemplate
 \define config-visibility-title()
 $:/config/EditorToolbarButtons/Visibility/$(currentTiddler)$
 \end
-<$list filter="[is[current]has[_canonical_uri]]">
+<$list filter="[all[current]has[_canonical_uri]]">
 
 <div class="tc-message-box">
 
@@ -19,7 +19,7 @@ $:/config/EditorToolbarButtons/Visibility/$(currentTiddler)$
 
 </$list>
 
-<$list filter="[is[current]!has[_canonical_uri]]">
+<$list filter="[all[current]!has[_canonical_uri]]">
 
 <$reveal state="$:/state/showeditpreview" type="match" text="yes">
 
diff --git a/core/ui/EditTemplate/title.tid b/core/ui/EditTemplate/title.tid
index f7963f2bb..e8379010f 100644
--- a/core/ui/EditTemplate/title.tid
+++ b/core/ui/EditTemplate/title.tid
@@ -5,7 +5,7 @@ tags: $:/tags/EditTemplate
 
 <$vars pattern="""[\|\[\]{}]""" bad-chars="""`| [ ] { }`""">
 
-<$list filter="[is[current]regexp:draft.title<pattern>]" variable="listItem">
+<$list filter="[all[current]regexp:draft.title<pattern>]" variable="listItem">
 
 <div class="tc-message-box">
 
diff --git a/core/ui/Manager/ItemSidebarTags.tid b/core/ui/Manager/ItemSidebarTags.tid
index e22c2a19a..6a63345c6 100644
--- a/core/ui/Manager/ItemSidebarTags.tid
+++ b/core/ui/Manager/ItemSidebarTags.tid
@@ -19,7 +19,7 @@ caption: {{$:/language/Manager/Item/Tags}}
 \end
 
 <p>
-<$list filter="[is[current]tags[]] [list[$:/config/Manager/RecentTags]] +[sort[title]] " variable="tag">
+<$list filter="[all[current]tags[]] [list[$:/config/Manager/RecentTags]] +[sort[title]] " variable="tag">
 <div>
 <$checkbox tiddler=<<currentTiddler>> tag=<<tag>> actions=<<tag-checkbox-actions>>>
 <$macrocall $name="tag-pill" tag=<<tag>>/>