diff --git a/core/ui/AdvancedSearch/Variables.tid b/core/ui/AdvancedSearch/Variables.tid
new file mode 100644
index 000000000..55053c886
--- /dev/null
+++ b/core/ui/AdvancedSearch/Variables.tid
@@ -0,0 +1,27 @@
+caption: {{$:/language/Search/Variables/Caption}}
+created: 20240215233810357
+list-before: $:/core/ui/AdvancedSearch/Filter
+modified: 20240429173634149
+tags: $:/tags/AdvancedSearch
+title: $:/core/ui/AdvancedSearch/Variables
+type: text/vnd.tiddlywiki
+
+\define set-next-input-tab(beforeafter:"after")
+<!-- TODO move stateTitle to field  -->
+<$macrocall $name="change-input-tab"
+	stateTitle="$:/state/tab--1498284803"
+	tag="$:/tags/AdvancedSearch"
+	beforeafter="$beforeafter$"
+	defaultState="$:/core/ui/AdvancedSearch/System"
+	actions="<$action-setfield $tiddler='$:/state/advancedsearch/currentTab' text=<<nextTab>>/>"/>
+\end
+
+{{$:/language/Search/Variables/Hint}}
+
+<div class="tc-search tc-advanced-search">
+<$keyboard key="((input-tab-right))" actions=<<set-next-input-tab>>>
+	<$keyboard key="((input-tab-left))" actions=<<set-next-input-tab "before">>>
+		<<search-variables>>
+	</$keyboard>
+</$keyboard>
+</div>
\ No newline at end of file
diff --git a/editions/tw5.com/tiddlers/$__core_ui_AdvancedSearch_Variables_ItemTemplate.tid b/core/ui/AdvancedSearch/Variables_ItemTemplate.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/$__core_ui_AdvancedSearch_Variables_ItemTemplate.tid
rename to core/ui/AdvancedSearch/Variables_ItemTemplate.tid
diff --git a/core/wiki/macros/dumpvariables.tid b/core/wiki/macros/dumpvariables.tid
index 7f13f0323..0ffdfea31 100644
--- a/core/wiki/macros/dumpvariables.tid
+++ b/core/wiki/macros/dumpvariables.tid
@@ -162,7 +162,7 @@ tags: $:/tags/Global
 	+[count[]] }$`
 /> <<lingo Matches>></p>
 
-<$list filter="[subfilter<tf.dv-filterString>] 
+<$list filter="[subfilter<tf.dv-filterString>]
 		+[search::some<tf.dv-getSearchText>]
 		+[filter<subfilter>]
 		+[!filter<tf.dv-getExcludeText>]"
diff --git a/editions/tw5.com/tiddlers/$__core_ui_AdvancedSearch_Variables.tid b/editions/tw5.com/tiddlers/$__core_ui_AdvancedSearch_Variables.tid
deleted file mode 100644
index 50f1de7e2..000000000
--- a/editions/tw5.com/tiddlers/$__core_ui_AdvancedSearch_Variables.tid
+++ /dev/null
@@ -1,13 +0,0 @@
-caption: {{$:/language/Search/Variables/Caption}}
-created: 20240215233810357
-modified: 20240216005108246
-tags: $:/tags/AdvancedSearch
-list-before: $:/core/ui/AdvancedSearch/Filter
-title: $:/core/ui/AdvancedSearch/Variables
-type: text/vnd.tiddlywiki
-
-{{$:/language/Search/Variables/Hint}}
-
-<div class="tc-search tc-advanced-search">
-<<search-variables>>
-</div>
\ No newline at end of file