diff --git a/core/ui/RootStylesheet.tid b/core/ui/RootStylesheet.tid
index 156b963dd..532b96bd6 100644
--- a/core/ui/RootStylesheet.tid
+++ b/core/ui/RootStylesheet.tid
@@ -4,7 +4,7 @@ code-body: yes
 \import [subfilter{$:/core/config/GlobalImportFilter}]
 \whitespace trim
 \rules only filteredtranscludeinline transcludeinline html
-<$refresh-blocker refreshBlockerList="[all[tiddlers]is[draft]] [all[tiddlers]prefix[$:/state/]] [all[tiddlers]prefix[$:/temp/]] -[[$:/state/sidebar]] -[[$:/state/sidebar/dimensions]] -[[$:/state/sidebar/resizing]] -[[$:/state/popup/menubar/hamburger]]">
+<$refresh-blocker refreshBlockerList="[is[draft]] [prefix[$:/state/]] [prefix[$:/temp/]] -[[$:/state/sidebar]] -[[$:/state/sidebar/dimensions]] -[[$:/state/sidebar/resizing]] -[[$:/state/popup/menubar/hamburger]]">
 	<$let currentTiddler={{$:/language}} languageTitle={{!!name}}>
 		<$list filter="[all[shadows+tiddlers]!is[draft]tag[$:/tags/Stylesheet]]">
 			<$refresh-blocker refreshBlockerList={{{ [<currentTiddler>get[refresh-blocker-list]] }}}>
diff --git a/editions/tw5.com/tiddlers/_tw_shared/styles.tid b/editions/tw5.com/tiddlers/_tw_shared/styles.tid
index f29ec51be..d7e61f575 100644
--- a/editions/tw5.com/tiddlers/_tw_shared/styles.tid
+++ b/editions/tw5.com/tiddlers/_tw_shared/styles.tid
@@ -1,6 +1,6 @@
 title: $:/_tw_shared/styles
 tags: $:/tags/Stylesheet TiddlyWikiSitesMenu
-refresh-blocker-list: [all[tiddlers]prefix[$:/state/]] [all[tiddlers]prefix[$:/temp/]] [all[tiddlers]is[draft]]
+refresh-blocker-list: [prefix[$:/state/]] [prefix[$:/temp/]] [is[draft]]
 
 \rules only filteredtranscludeinline transcludeinline macrodef macrocallinline macrocallblock
 
diff --git a/editions/tw5.com/tiddlers/demonstrations/CustomStoryTiddlerTemplateDemo.tid/Styles.tid b/editions/tw5.com/tiddlers/demonstrations/CustomStoryTiddlerTemplateDemo.tid/Styles.tid
index 5957ae651..8b49f3d13 100644
--- a/editions/tw5.com/tiddlers/demonstrations/CustomStoryTiddlerTemplateDemo.tid/Styles.tid
+++ b/editions/tw5.com/tiddlers/demonstrations/CustomStoryTiddlerTemplateDemo.tid/Styles.tid
@@ -1,6 +1,6 @@
 title: $:/_tw5.com/CustomStoryTiddlerTemplateDemo/Styles
 tags: $:/tags/Stylesheet
-refresh-blocker-list: [all[tiddlers]prefix[$:/state/]] [all[tiddlers]prefix[$:/temp/]] [all[tiddlers]is[draft]]
+refresh-blocker-list: [prefix[$:/state/]] [prefix[$:/temp/]] [is[draft]]
 
 .tc-custom-tiddler-template {
 	border: 3px solid <<colour muted-foreground>>;
diff --git a/editions/tw5.com/tiddlers/howtos/Custom_data-styles.tid b/editions/tw5.com/tiddlers/howtos/Custom_data-styles.tid
index 2a2d540a0..93d007e08 100644
--- a/editions/tw5.com/tiddlers/howtos/Custom_data-styles.tid
+++ b/editions/tw5.com/tiddlers/howtos/Custom_data-styles.tid
@@ -3,7 +3,7 @@ modified: 20230803050721827
 tags: data-tags-styles [[How to apply custom styles]] $:/tags/Stylesheet
 title: Custom data-styles
 type: text/vnd.tiddlywiki
-refresh-blocker-list: [all[tiddlers]prefix[$:/state/]] [all[tiddlers]prefix[$:/temp/]] [all[tiddlers]is[draft]]
+refresh-blocker-list: [prefix[$:/state/]] [prefix[$:/temp/]] [is[draft]]
 
 \rules only filteredtranscludeinline transcludeinline macrodef macrocallinline html
 
diff --git a/editions/tw5.com/tiddlers/saving/SavingThumbnailsStyles.tid b/editions/tw5.com/tiddlers/saving/SavingThumbnailsStyles.tid
index e6f745717..8676b77f4 100644
--- a/editions/tw5.com/tiddlers/saving/SavingThumbnailsStyles.tid
+++ b/editions/tw5.com/tiddlers/saving/SavingThumbnailsStyles.tid
@@ -1,6 +1,6 @@
 title: $:/SavingThumbnailsStyles
 tags: $:/tags/Stylesheet
-refresh-blocker-list: [all[tiddlers]prefix[$:/state/]] [all[tiddlers]prefix[$:/temp/]] [all[tiddlers]is[draft]]
+refresh-blocker-list: [prefix[$:/state/]] [prefix[$:/temp/]] [is[draft]]
 
 .tc-thumbnail-tabs .tc-tab-buttons {
 	background: <<color message-background>>;
diff --git a/editions/tw5.com/tiddlers/system/doc-styles.tid b/editions/tw5.com/tiddlers/system/doc-styles.tid
index e249b8e5e..db1140bb0 100644
--- a/editions/tw5.com/tiddlers/system/doc-styles.tid
+++ b/editions/tw5.com/tiddlers/system/doc-styles.tid
@@ -4,7 +4,7 @@ modified: 20240223123123497
 tags: $:/tags/Stylesheet
 title: $:/editions/tw5.com/doc-styles
 type: text/vnd.tiddlywiki
-refresh-blocker-list: [all[tiddlers]prefix[$:/state/]] [all[tiddlers]prefix[$:/temp/]] [all[tiddlers]is[draft]]
+refresh-blocker-list: [prefix[$:/state/]] [prefix[$:/temp/]] [is[draft]]
 
 .doc-def {
 	font-style: normal;
diff --git a/editions/tw5.com/tiddlers/system/tw5.com-styles.tid b/editions/tw5.com/tiddlers/system/tw5.com-styles.tid
index 317f43fd0..ae6e50363 100644
--- a/editions/tw5.com/tiddlers/system/tw5.com-styles.tid
+++ b/editions/tw5.com/tiddlers/system/tw5.com-styles.tid
@@ -3,7 +3,7 @@ modified: 20220719132112414
 tags: $:/tags/Stylesheet
 title: $:/_tw5.com-styles
 type: text/vnd.tiddlywiki
-refresh-blocker-list: [all[tiddlers]prefix[$:/state/]] [all[tiddlers]prefix[$:/temp/]] [all[tiddlers]is[draft]]
+refresh-blocker-list: [prefix[$:/state/]] [prefix[$:/temp/]] [is[draft]]
 
 \rules only filteredtranscludeinline transcludeinline macrodef macrocallinline macrocallblock