diff --git a/core/ui/ControlPanel/Basics.tid b/core/ui/ControlPanel/Basics.tid
index b2ef2832a4a..0b023ccc62d 100644
--- a/core/ui/ControlPanel/Basics.tid
+++ b/core/ui/ControlPanel/Basics.tid
@@ -2,23 +2,23 @@ title: $:/core/ui/ControlPanel/Basics
 tags: $:/tags/ControlPanel/Info
 caption: {{$:/language/ControlPanel/Basics/Caption}}
 
-\define lingo-base() $:/language/ControlPanel/Basics/
+\procedure lingo-base() $:/language/ControlPanel/Basics/
 
-\define show-filter-count(filter)
 \whitespace trim
+
+\procedure show-filter-count(filter)
 <$button class="tc-btn-invisible">
-<$action-setfield $tiddler="$:/temp/advancedsearch" $value="""$filter$"""/>
-<$action-setfield $tiddler="$:/temp/advancedsearch/input" $value="""$filter$"""/>
+<$action-setfield $tiddler="$:/temp/advancedsearch" $value=<<filter>>/>
+<$action-setfield $tiddler="$:/temp/advancedsearch/input" $value=<<filter>>/>
 <$action-setfield $tiddler="$:/temp/advancedsearch/refresh" text="yes"/>
 <$action-setfield $tiddler="$:/state/tab--1498284803" $value="$:/core/ui/AdvancedSearch/Filter"/>
 <$action-navigate $to="$:/AdvancedSearch"/>
 <$action-sendmessage $message="tm-focus-selector" $param=".tc-advanced-search input"/>
-''<$count filter="""$filter$"""/>''
+''<$count filter=<<filter>>/>''
 &#32;
 {{$:/core/images/advanced-search-button}}
 </$button>
 \end
-\whitespace trim
 
 |tc-max-width tc-edit-max-width|k
 |<<lingo Version/Prompt>> |''<<version>>'' |
diff --git a/core/wiki/allfields.tid b/core/wiki/allfields.tid
index 31574046f93..d46881b6624 100644
--- a/core/wiki/allfields.tid
+++ b/core/wiki/allfields.tid
@@ -3,16 +3,19 @@ title: $:/snippets/allfields
 \whitespace trim
 \import [[$:/core/ui/ControlPanel/Basics]]
 
-\define renderfield(title)
+\function getLingoText() [[$:/language/Docs/Fields/]] [<title>] +[join[]get[text]]
+
+\procedure renderfield(title)
 <tr class="tc-view-field">
 	<td class="tc-view-field-name">
-		''<$text text=<<__title__>>/>'':
+		''<$text text=<<title>>/>'':
 	</td>
 	<td class="tc-view-field-value">
-		//<$text text={{$:/language/Docs/Fields/$title$}}/>//
+		//<<getLingoText>>//
 	</td>
 	<td class="tc-view-field-links">
-		<<show-filter-count "[has[$title$]sort[]]">>
+		<!-- show-filter-count expects a filter string. It does no more processing -->
+		<$macrocall $name="show-filter-count" filter=`[has[$(title)$]sort[]]`>>
 	</td>
 </tr>
 \end