diff --git a/core/language/en-GB/Search.multids b/core/language/en-GB/Search.multids
index b797b0a51..ca842314c 100644
--- a/core/language/en-GB/Search.multids
+++ b/core/language/en-GB/Search.multids
@@ -19,19 +19,25 @@ System/Caption: System
 System/Hint: Search for system tiddlers
 System/Matches: //<small><<resultCount>> matches</small>//
 Variables/Caption: Variables
+Variables/Content: Variable content
 Variables/Clear/Exclude: Clear exlude
 Variables/Clear/Search: Clear search
 Variables/Exclude: Exclude:
+Variables/Exclude/Edit: Edit
+Variables/Function/Content: Function content
 Variables/Exclude/Hide: Hide exclude input
-Variables/Exclude/Hint: Filter eg: [prefix[.]]
-Variables/Exclude/Save: Create exclude filter
+Variables/Exclude/Hint: Exclude Filter eg: [prefix[.]]
+Variables/Exclude/Save: Create new exclude filter
 Variables/Exclude/Show: Show exclude input
+Variables/Exclude/Show/Config: Show saved exclude configurations
 Variables/Exclude/Description: EDIT ME - Description is shown in the dropdown
 Variables/ExpandAll: Expand all:
 Variables/FoldAll: Fold all:
 Variables/Filter: Search:
-Variables/Filter/Hint: Text eg: .attr
+Variables/Filter/Hint: Search Variable Name eg: .attr
 Variables/Hint: Filter global variables
+Variables/Info/Toggle/Show: Show details search input
+Variables/Info/Toggle/Hide: Hide details search input
 Variables/Matches: //<small><<resultCount>> matches</small>//
 Variables/Search: Search Variables
 Variables/Search/Details: Search tiddler text, tags:
diff --git a/core/ui/AdvancedSearch/Variables_ItemTemplate.tid b/core/ui/AdvancedSearch/Variables_ItemTemplate.tid
index e1febd401..840d6ee22 100644
--- a/core/ui/AdvancedSearch/Variables_ItemTemplate.tid
+++ b/core/ui/AdvancedSearch/Variables_ItemTemplate.tid
@@ -11,6 +11,6 @@ title: $:/core/ui/AdvancedSearch/Variables/ItemTemplate
 		<$transclude field="description"/>
 	</$let>
 </$link>
-<$button actions=<<editSnippet>> class="tc-btn-invisible tc-small-gap-left">
+<$button actions=<<editSnippet>> class="tc-btn-invisible tc-small-gap-left" tooltip={{$:/language/Search/Variables/Exclude/Edit}}>
 	{{$:/core/images/edit-button}}
 </$button>
diff --git a/core/wiki/macros/dumpvariables.tid b/core/wiki/macros/dumpvariables.tid
index 6f634e8df..568cf02d4 100644
--- a/core/wiki/macros/dumpvariables.tid
+++ b/core/wiki/macros/dumpvariables.tid
@@ -71,7 +71,7 @@ tags: $:/tags/Global
 
 \procedure dv-clearStatesButton()
 <span class="tc-small-gap"><<lingo FoldAll>></span>
-<$button class="tc-btn-invisible tc-tiny-gap-left">
+<$button class="tc-btn-invisible tc-tiny-gap-left" tooltip={{$:/language/Search/Variables/FoldAll}}>
 	<!-- "search text details" should be preserved -->
 	<$action-deletetiddler $filter="[prefix<DV-SEARCH-STATE>]"/>
 	{{$:/core/images/fold-all-button}}
@@ -96,7 +96,7 @@ tags: $:/tags/Global
 
 \procedure dv-expandAllStatesButton()
 <span class="tc-tiny-gap"><<lingo ExpandAll>></span>
-<$button class="tc-btn-invisible">
+<$button class="tc-btn-invisible" tooltip={{$:/language/Search/Variables/ExpandAll}}>
 	<$action-setfield $tiddler=<<DV-SEARCH-STATE>>
 		text={{{ [<tf.dv-toggleInfoState>get[text]] +[toggle[yes],[no]] }}}
 	/>
@@ -155,7 +155,7 @@ tags: $:/tags/Global
 
 <<dv-searchForm>>
 
-<p><$text text=`${ [subfilter<tf.dv-filterString>]
+<p tabindex="0"><$text text=`${ [subfilter<tf.dv-filterString>]
 	+[search::some<tf.dv-getSearchText>]
 	+[filter<subfilter>]
 	+[!filter<tf.dv-getExcludeText>]
@@ -176,24 +176,28 @@ tags: $:/tags/Global
 				{{$:/core/images/right-arrow}}
 			<% endif %>
 			<code class="tc-small-gap-right"><$text text=<<tf.dv-formattedVar>>/></code>
-			<% if [<tf.dv-formattedVar>prefix[\function]] %>
-				<!-- Be aware that the "format" filter operator uses $var-name$ for compatibility reasons -->
-				<span class="tc-tiny-gap-right"><$text text={{{ [<varname>format:variable[$firstLine$]] }}}/></span>
-			<% endif %>
 		</$button>
+		<% if [<tf.dv-formattedVar>prefix[\function]] %>
+			<!-- Be aware that the "format" filter operator uses $var-name$ for compatibility reasons -->
+			<span tabindex="0" class="tc-tiny-gap-right" title={{$:/language/Search/Variables/Function/Content}}>
+				<$text text={{{ [<varname>format:variable[$firstLine$]] }}}/>
+			</span>
+		<% endif %>
 
 		<% if [<tf.dv-varState>get[text]match[yes]] %>
-			<$button actions=<<dv-toggleInfoState>> class="tc-btn-invisible tc-small-gap-left">
+			<$button actions=<<dv-toggleInfoState>> 
+				class="tc-btn-invisible tc-small-gap-left"
+			>
 				<% if [<tf.dv-toggleInfoState>get[text]match[yes]] %>
-					{{$:/core/images/up-arrow}}
+					<span title={{$:/language/Search/Variables/Info/Toggle/Hide}}>{{$:/core/images/up-arrow}}</span>
 				<% else %>
-					{{$:/core/images/advanced-search-button}}
+					<span title={{$:/language/Search/Variables/Info/Toggle/Show}}>{{$:/core/images/advanced-search-button}}</span>
 				<% endif %>
 			</$button>
 			<blockquote class="tc-quote">
 				<% if [<tf.dv-toggleInfoState>get[text]match[yes]] %>
 					<div class="tc-labeled-input-wrapper">
-						<span class="tc-fixed-label tc-align-right"><<lingo Search/Details>></span>
+						<span tabindex="0" class="tc-fixed-label tc-align-right"><<lingo Search/Details>></span>
 						<$edit-text tiddler=<<tf.dv-detailsSearch>> tag=input class="tc-fluid-input tc-small-gap-left"/>
 					</div>
 					<<dv-info>>
@@ -201,7 +205,7 @@ tags: $:/tags/Global
 				<% if [<varname>prefix[\function]] %>
 					<$codeblock code={{{ [<varname>getvariable[value]] }}}/>
 				<% endif %>
-				<$codeblock code={{{ [<varname>getvariable[]] }}}/>
+				<pre tabindex="0" title={{$:/language/Search/Variables/Content}}><code><$text text={{{ [<varname>getvariable[]] }}}/></code></pre>
 			</blockquote>
 		<% endif %>
 	</div>
@@ -380,7 +384,12 @@ tags: $:/tags/Global
 \end
 
 \procedure dv-addNewVariableFilter()
-<$button tag="a" actions=<<dv-addNewVariableFilter-actions>> class="tc-tiddlylink">
+<$button tag="a"
+	actions=<<dv-addNewVariableFilter-actions>>
+	class="tc-tiddlylink"
+	aria-label={{$:/language/Search/Variables/Exclude/Save}}
+	tabindex="0"
+>
 	<em>
 		<$text text={{$:/language/Search/Variables/Exclude/Save}}/>
 	</em>
@@ -389,7 +398,10 @@ tags: $:/tags/Global
 
 \procedure moreVariablesPopup()
 <span class="tc-popup-keep btn-y">
-	<$button popup=<<qualify "$:/state/variableDropdown">> class="tc-btn-invisible">
+	<$button popup=<<qualify "$:/state/variableDropdown">> 
+		class="tc-btn-invisible"
+		tooltip={{$:/language/Search/Variables/Exclude/Show/Config}}
+	>
 		{{$:/core/images/down-arrow}}
 	</$button>
 </span>
diff --git a/themes/tiddlywiki/vanilla/flexible-form-styles.tid b/themes/tiddlywiki/vanilla/flexible-form-styles.tid
index df74b43a9..60a1e0393 100644
--- a/themes/tiddlywiki/vanilla/flexible-form-styles.tid
+++ b/themes/tiddlywiki/vanilla/flexible-form-styles.tid
@@ -21,7 +21,7 @@ tags: $:/tags/Stylesheet
 .tc-dv-type {
 	grid-area: tc-dv-type;
 	display: grid;
-	grid-column-gap: .5em;
+	grid-column-gap: 0.3em;
 	grid-row-gap: 0.2em;
 	grid-template-columns: 5.3em;
 	grid-template-areas:
@@ -29,14 +29,14 @@ tags: $:/tags/Stylesheet
 }
 
 .tc-dv-filterOptions {
-	border: 1px solid <<colour code-border>>;
+	<!-- border: 1px solid <<colour code-border>>; -->
 	padding: 0 .3em;
 }
 
 .tc-dv-sort {
 	grid-area: tc-dv-sort;
 	display: grid;
-	grid-column-gap: 0.5em;
+	grid-column-gap: 0.3em;
 	grid-row-gap: 0.2em;
 	grid-template-columns: 6em 9em;
 	grid-template-areas: