diff --git a/core/ui/AdvancedSearch.tid b/core/ui/AdvancedSearch.tid
index bb112a0f6..b85a58fb8 100644
--- a/core/ui/AdvancedSearch.tid
+++ b/core/ui/AdvancedSearch.tid
@@ -1,5 +1,5 @@
 title: $:/AdvancedSearch
 
 <div class="tw-advanced-search">
-<<tabs "[all[tiddlers+shadows]!has[draft.of]tag[$:/tags/AdvancedSearch]]" "$:/core/ui/AdvancedSearch/System">>
+<<tabs "[all[tiddlers+shadows]tag[$:/tags/AdvancedSearch]!has[draft.of]]" "$:/core/ui/AdvancedSearch/System">>
 </div>
diff --git a/core/ui/ControlPanel.tid b/core/ui/ControlPanel.tid
index f18744ce5..e91ec2444 100644
--- a/core/ui/ControlPanel.tid
+++ b/core/ui/ControlPanel.tid
@@ -1,5 +1,5 @@
 title: $:/ControlPanel
 
 <div class="tw-control-panel">
-<<tabs "[all[tiddlers+shadows]!has[draft.of]tag[$:/tags/ControlPanel]]" "$:/core/ui/ControlPanel/Basics">>
+<<tabs "[all[tiddlers+shadows]tag[$:/tags/ControlPanel]!has[draft.of]]" "$:/core/ui/ControlPanel/Basics">>
 </div>
diff --git a/core/ui/ControlPanel/Advanced.tid b/core/ui/ControlPanel/Advanced.tid
index 24448a35c..e73a62894 100644
--- a/core/ui/ControlPanel/Advanced.tid
+++ b/core/ui/ControlPanel/Advanced.tid
@@ -5,5 +5,5 @@ caption: {{$:/language/ControlPanel/Advanced/Caption}}
 {{$:/language/ControlPanel/Advanced/Hint}}
 
 <div class="tw-control-panel">
-<<tabs "[all[tiddlers+shadows]!has[draft.of]tag[$:/tags/ControlPanel/Advanced]]" "$:/core/ui/ControlPanel/Advanced/TiddlerFields">>
+<<tabs "[all[tiddlers+shadows]tag[$:/tags/ControlPanel/Advanced]!has[draft.of]]" "$:/core/ui/ControlPanel/Advanced/TiddlerFields">>
 </div>
diff --git a/core/ui/ControlPanel/Appearance.tid b/core/ui/ControlPanel/Appearance.tid
index 6b9f898df..d52d75360 100644
--- a/core/ui/ControlPanel/Appearance.tid
+++ b/core/ui/ControlPanel/Appearance.tid
@@ -5,5 +5,5 @@ caption: {{$:/language/ControlPanel/Appearance/Caption}}
 {{$:/language/ControlPanel/Appearance/Hint}}
 
 <div class="tw-control-panel">
-<<tabs "[all[tiddlers+shadows]!has[draft.of]tag[$:/tags/ControlPanel/Appearance]]" "$:/core/ui/ControlPanel/Appearance/Theme">>
+<<tabs "[all[tiddlers+shadows]tag[$:/tags/ControlPanel/Appearance]!has[draft.of]]" "$:/core/ui/ControlPanel/Appearance/Theme">>
 </div>
diff --git a/core/ui/EditTemplate.tid b/core/ui/EditTemplate.tid
index 887cff4c4..b2ca9703f 100644
--- a/core/ui/EditTemplate.tid
+++ b/core/ui/EditTemplate.tid
@@ -6,7 +6,7 @@ tw-tiddler-frame tw-tiddler-edit-frame $(missingTiddlerClass)$ $(shadowTiddlerCl
 <div class=<<frame-classes>>>
 <$set name="storyTiddler" value=<<currentTiddler>>>
 <$keyboard key="ctrl+enter" message="tw-save-tiddler">
-<$list filter="[all[tiddlers+shadows]!has[draft.of]tag[$:/tags/EditTemplate]]" variable="listItem">
+<$list filter="[all[tiddlers+shadows]tag[$:/tags/EditTemplate]!has[draft.of]]" variable="listItem">
 <$transclude tiddler=<<listItem>>/>
 </$list>
 </$keyboard>
diff --git a/core/ui/EditTemplate/controls.tid b/core/ui/EditTemplate/controls.tid
index 927505e5c..82d5eaa5c 100644
--- a/core/ui/EditTemplate/controls.tid
+++ b/core/ui/EditTemplate/controls.tid
@@ -1,4 +1,4 @@
 title: $:/core/ui/EditTemplate/controls
 tags: $:/tags/EditTemplate
 
-<span class="tw-tiddler-controls titlebar"> <$list filter="[all[tiddlers+shadows]!has[draft.of]tag[$:/tags/EditToolbar]]" variable="listItem"><$transclude tiddler=<<listItem>>/></$list> </span>
+<span class="tw-tiddler-controls titlebar"> <$list filter="[all[tiddlers+shadows]tag[$:/tags/EditToolbar]!has[draft.of]]" variable="listItem"><$transclude tiddler=<<listItem>>/></$list> </span>
diff --git a/core/ui/PageTemplate.tid b/core/ui/PageTemplate.tid
index febb56866..ad5833cdd 100644
--- a/core/ui/PageTemplate.tid
+++ b/core/ui/PageTemplate.tid
@@ -4,7 +4,7 @@ title: $:/core/ui/PageTemplate
 
 <$dropzone>
 
-<$list filter="[all[tiddlers+shadows]!has[draft.of]tag[$:/tags/PageTemplate]]" variable="listItem">
+<$list filter="[all[tiddlers+shadows]tag[$:/tags/PageTemplate]!has[draft.of]]" variable="listItem">
 
 <$transclude tiddler=<<listItem>>/>
 
diff --git a/core/ui/PageTemplate/alerts.tid b/core/ui/PageTemplate/alerts.tid
index 3fe0a497f..e8bed8ecf 100644
--- a/core/ui/PageTemplate/alerts.tid
+++ b/core/ui/PageTemplate/alerts.tid
@@ -3,6 +3,6 @@ tags: $:/tags/PageTemplate
 
 <div class="tw-alerts">
 
-<$list filter="[all[tiddlers+shadows]!has[draft.of]tag[$:/tags/Alert]]" template="$:/core/ui/AlertTemplate" storyview="pop"/>
+<$list filter="[all[tiddlers+shadows]tag[$:/tags/Alert]!has[draft.of]]" template="$:/core/ui/AlertTemplate" storyview="pop"/>
 
 </div>
diff --git a/core/ui/PageTemplate/sidebar.tid b/core/ui/PageTemplate/sidebar.tid
index d559f3204..67f74e67f 100644
--- a/core/ui/PageTemplate/sidebar.tid
+++ b/core/ui/PageTemplate/sidebar.tid
@@ -12,7 +12,7 @@ tags: $:/tags/PageTemplate
 
 <div class="tw-page-controls">
 
-<$list filter="[all[tiddlers+shadows]!has[draft.of]tag[$:/tags/PageControls]]" variable="listItem"><$transclude tiddler=<<listItem>>/></$list>
+<$list filter="[all[tiddlers+shadows]tag[$:/tags/PageControls]!has[draft.of]]" variable="listItem"><$transclude tiddler=<<listItem>>/></$list>
 
 </div>
 
diff --git a/core/ui/PageTemplate/topleftbar.tid b/core/ui/PageTemplate/topleftbar.tid
index 7b6ac0fa9..ee5cf7d8a 100644
--- a/core/ui/PageTemplate/topleftbar.tid
+++ b/core/ui/PageTemplate/topleftbar.tid
@@ -2,5 +2,5 @@ title: $:/core/ui/PageTemplate/topleftbar
 tags: $:/tags/PageTemplate
 
 <span class="tw-topbar tw-topbar-left">
-<$list filter="[all[tiddlers+shadows]!has[draft.of]tag[$:/tags/TopLeftBar]]" variable="listItem"><$transclude tiddler=<<listItem>>/></$list>
+<$list filter="[all[tiddlers+shadows]tag[$:/tags/TopLeftBar]!has[draft.of]]" variable="listItem"><$transclude tiddler=<<listItem>>/></$list>
 </span>
diff --git a/core/ui/PageTemplate/toprightbar.tid b/core/ui/PageTemplate/toprightbar.tid
index 306c6a64c..ebe35c9d2 100644
--- a/core/ui/PageTemplate/toprightbar.tid
+++ b/core/ui/PageTemplate/toprightbar.tid
@@ -2,5 +2,5 @@ title: $:/core/ui/PageTemplate/toprightbar
 tags: $:/tags/PageTemplate
 
 <span class="tw-topbar tw-topbar-right">
-<$list filter="[all[tiddlers+shadows]!has[draft.of]tag[$:/tags/TopRightBar]]" variable="listItem"><$transclude tiddler=<<listItem>>/></$list>
+<$list filter="[all[tiddlers+shadows]tag[$:/tags/TopRightBar]!has[draft.of]]" variable="listItem"><$transclude tiddler=<<listItem>>/></$list>
 </span>
diff --git a/core/ui/SideBar/More.tid b/core/ui/SideBar/More.tid
index 951f03f63..e46088578 100644
--- a/core/ui/SideBar/More.tid
+++ b/core/ui/SideBar/More.tid
@@ -3,5 +3,5 @@ tags: $:/tags/SideBar
 caption: {{$:/language/SideBar/More/Caption}}
 
 <div class="tw-more-sidebar">
-<<tabs "[all[tiddlers+shadows]!has[draft.of]tag[$:/tags/MoreSideBar]]" "$:/core/ui/MoreSideBar/Tags" "$:/state/tab/moresidebar">>
+<<tabs "[all[tiddlers+shadows]tag[$:/tags/MoreSideBar]!has[draft.of]]" "$:/core/ui/MoreSideBar/Tags" "$:/state/tab/moresidebar">>
 </div>
diff --git a/core/ui/SideBarLists.tid b/core/ui/SideBarLists.tid
index 5e901a86e..327b572ea 100644
--- a/core/ui/SideBarLists.tid
+++ b/core/ui/SideBarLists.tid
@@ -26,7 +26,7 @@ title: $:/core/ui/SideBarLists
 
 <$reveal state="$:/temp/search" type="match" text="">
 
-<<tabs "[all[tiddlers+shadows]!has[draft.of]tag[$:/tags/SideBar]]" "$:/core/ui/SideBar/Open" "$:/state/tab/sidebar">>
+<<tabs "[all[tiddlers+shadows]tag[$:/tags/SideBar]!has[draft.of]]" "$:/core/ui/SideBar/Open" "$:/state/tab/sidebar">>
 
 </$reveal>
 </div>
diff --git a/core/ui/TiddlerInfo.tid b/core/ui/TiddlerInfo.tid
index cc0992554..bd80da6c5 100644
--- a/core/ui/TiddlerInfo.tid
+++ b/core/ui/TiddlerInfo.tid
@@ -1,3 +1,3 @@
 title: $:/core/ui/TiddlerInfo
 
-<<tabs "[all[tiddlers+shadows]!has[draft.of]tag[$:/tags/TiddlerInfo]]" "$:/core/ui/TiddlerInfo/References">>
+<<tabs "[all[tiddlers+shadows]tag[$:/tags/TiddlerInfo]!has[draft.of]]" "$:/core/ui/TiddlerInfo/References">>
diff --git a/core/ui/TiddlerInfo/Advanced.tid b/core/ui/TiddlerInfo/Advanced.tid
index 25f6a34cd..d2428e2b7 100644
--- a/core/ui/TiddlerInfo/Advanced.tid
+++ b/core/ui/TiddlerInfo/Advanced.tid
@@ -2,7 +2,7 @@ title: $:/core/ui/TiddlerInfo/Advanced
 tags: $:/tags/TiddlerInfo
 caption: {{$:/language/TiddlerInfo/Advanced/Caption}}
 
-<$list filter="[all[tiddlers+shadows]!has[draft.of]tag[$:/tags/TiddlerInfo/Advanced]]" variable="listItem">
+<$list filter="[all[tiddlers+shadows]tag[$:/tags/TiddlerInfo/Advanced]!has[draft.of]]" variable="listItem">
 <$transclude tiddler=<<listItem>>/>
 
 </$list>
diff --git a/core/ui/ViewTemplate.tid b/core/ui/ViewTemplate.tid
index 10066b900..73c99d69d 100644
--- a/core/ui/ViewTemplate.tid
+++ b/core/ui/ViewTemplate.tid
@@ -3,6 +3,6 @@ title: $:/core/ui/ViewTemplate
 \define frame-classes()
 tw-tiddler-frame tw-tiddler-view-frame $(missingTiddlerClass)$ $(shadowTiddlerClass)$ $(systemTiddlerClass)$
 \end
-<$set name="storyTiddler" value=<<currentTiddler>>><$set name="tiddlerInfoState" value=<<qualify "$:/state/tiddlerInfo">>><$tiddler tiddler=<<currentTiddler>>><div class=<<frame-classes>>><$list filter="[all[tiddlers+shadows]!has[draft.of]tag[$:/tags/ViewTemplate]]" variable="listItem"><$transclude tiddler=<<listItem>>/></$list>
+<$set name="storyTiddler" value=<<currentTiddler>>><$set name="tiddlerInfoState" value=<<qualify "$:/state/tiddlerInfo">>><$tiddler tiddler=<<currentTiddler>>><div class=<<frame-classes>>><$list filter="[all[tiddlers+shadows]tag[$:/tags/ViewTemplate]!has[draft.of]]" variable="listItem"><$transclude tiddler=<<listItem>>/></$list>
 </div>
 </$tiddler></$set></$set>
diff --git a/core/ui/ViewTemplate/title.tid b/core/ui/ViewTemplate/title.tid
index b7f861e2e..b5edeab27 100644
--- a/core/ui/ViewTemplate/title.tid
+++ b/core/ui/ViewTemplate/title.tid
@@ -7,7 +7,7 @@ fill:$(foregroundColor)$;
 <div class="tw-tiddler-title">
 <div class="titlebar">
 <span class="tw-tiddler-controls">
-<$list filter="[all[tiddlers+shadows]!has[draft.of]tag[$:/tags/ViewToolbar]]" variable="listItem"><$transclude tiddler=<<listItem>>/></$list>
+<$list filter="[all[tiddlers+shadows]tag[$:/tags/ViewToolbar]!has[draft.of]]" variable="listItem"><$transclude tiddler=<<listItem>>/></$list>
 </span>
 <$set name="foregroundColor" value={{!!color}}>
 <span style=<<title-styles>>>