diff --git a/core/templates/exporters/CsvFile.tid b/core/templates/exporters/CsvFile.tid
index 63b2e057d6..23d3bbd73d 100644
--- a/core/templates/exporters/CsvFile.tid
+++ b/core/templates/exporters/CsvFile.tid
@@ -3,7 +3,4 @@ tags: $:/tags/Exporter
 description: {{$:/language/Exporters/CsvFile}}
 extension: .csv
 
-\define renderContent()
-<$text text=<<csvtiddlers filter:"""$(exportFilter)$""" format:"quoted-comma-sep">>/>
-\end
-<<renderContent>>
+<$macrocall $name="csvtiddlers" filter=<<exportFilter>> format="quoted-comma-sep" $output="text/raw"/>
diff --git a/core/templates/exporters/JsonFile.tid b/core/templates/exporters/JsonFile.tid
index f3a5142c22..9008906cc3 100644
--- a/core/templates/exporters/JsonFile.tid
+++ b/core/templates/exporters/JsonFile.tid
@@ -3,7 +3,4 @@ tags: $:/tags/Exporter
 description: {{$:/language/Exporters/JsonFile}}
 extension: .json
 
-\define renderContent()
-<$text text=<<jsontiddlers filter:"""$(exportFilter)$""">>/>
-\end
-<<renderContent>>
+<$macrocall $name="jsontiddlers" filter=<<exportFilter>> $output="text/raw"/>
diff --git a/core/wiki/macros/export.tid b/core/wiki/macros/export.tid
index 567f8ff95f..c55df3ecbf 100644
--- a/core/wiki/macros/export.tid
+++ b/core/wiki/macros/export.tid
@@ -18,7 +18,7 @@ $baseFilename$$(extension)$
 <$list filter="[all[shadows+tiddlers]tag[$:/tags/Exporter]]">
 <$set name="extension" value={{!!extension}}>
 <$button class="tc-btn-invisible">
-<$action-sendmessage $message="tm-download-file" $param=<<currentTiddler>> exportFilter="""$exportFilter$""" filename=<<exportButtonFilename """$baseFilename$""">>/>
+<$action-sendmessage $message="tm-download-file" $param=<<currentTiddler>> exportFilter=<<__exportFilter__>> filename=<<exportButtonFilename """$baseFilename$""">>/>
 <$action-deletetiddler $tiddler=<<qualify "$:/state/popup/export">>/>
 <$transclude field="description"/>
 </$button>