diff --git a/core/language/en-GB/ControlPanel.multids b/core/language/en-GB/ControlPanel.multids
index e414a636c..5204d62aa 100644
--- a/core/language/en-GB/ControlPanel.multids
+++ b/core/language/en-GB/ControlPanel.multids
@@ -52,7 +52,7 @@ Palette/HideEditor/Caption: hide editor
 Palette/Prompt: Current palette:
 Palette/ShowEditor/Caption: show editor
 Parsing/Caption: Parsing
-Parsing/Hint: Here you can globally disable individual wiki parser rules. Take care as disabling some parser rules can prevent ~TiddlyWiki functioning correctly (you can restore normal operation with [[safe mode|http://tiddlywiki.com/#SafeMode]] )
+Parsing/Hint: Here you can globally disable/enable wiki parser rules. For changes to take effect, save and reload your wiki. Disabling certain parser rules can prevent <$text text="TiddlyWiki"/> from functioning correctly. Use [[safe mode|http://tiddlywiki.com/#SafeMode]] to restore normal operation.
 Parsing/Block/Caption: Block Parse Rules
 Parsing/Inline/Caption: Inline Parse Rules
 Parsing/Pragma/Caption: Pragma Parse Rules
diff --git a/core/modules/filters/wikiparserrules.js b/core/modules/filters/wikiparserrules.js
index ee57113c8..213298515 100644
--- a/core/modules/filters/wikiparserrules.js
+++ b/core/modules/filters/wikiparserrules.js
@@ -16,10 +16,11 @@ Filter operator for returning the names of the wiki parser rules in this wiki
 Export our filter function
 */
 exports.wikiparserrules = function(source,operator,options) {
-	var results = [];
+	var results = [],
+		operand = operator.operand;
 	$tw.utils.each($tw.modules.types.wikirule,function(mod) {
 		var exp = mod.exports;
-		if(exp.types[operator.operand]) {
+		if(!operand || exp.types[operand]) {
 			results.push(exp.name);
 		}
 	});
diff --git a/core/ui/ControlPanel/Parsing.tid b/core/ui/ControlPanel/Parsing.tid
index de027f9c3..4ba0f0ae1 100644
--- a/core/ui/ControlPanel/Parsing.tid
+++ b/core/ui/ControlPanel/Parsing.tid
@@ -4,30 +4,30 @@ caption: {{$:/language/ControlPanel/Parsing/Caption}}
 
 \define lingo-base() $:/language/ControlPanel/Parsing/
 
-\define parsing-inner(typeCap)
-<li>
-<$checkbox tiddler="""$:/config/WikiParserRules/$typeCap$/$(currentTiddler)$""" field="text" checked="enable" unchecked="disable" default="enable"> ''<$text text=<<currentTiddler>>/>'': </$checkbox>
-</li>
+\define toggle(Type)
+<$checkbox
+tiddler="""$:/config/WikiParserRules/$Type$/$(rule)$"""
+field="text"
+checked="enable"
+unchecked="disable"
+default="enable">
+<<rule>>
+</$checkbox>
 \end
 
-\define parsing-outer(typeLower,typeCap)
-<ul>
-<$list filter="[wikiparserrules[$typeLower$]]">
-<<parsing-inner typeCap:"$typeCap$">>
+\define rules(type,Type)
+<$list filter="[wikiparserrules[$type$]]" variable="rule">
+<dd><<toggle $Type$>></dd>
 </$list>
-</ul>
 \end
 
 <<lingo Hint>>
 
-! <<lingo Pragma/Caption>>
-
-<<parsing-outer typeLower:"pragma" typeCap:"Pragma">>
-
-! <<lingo Inline/Caption>>
-
-<<parsing-outer typeLower:"inline" typeCap:"Inline">>
-
-! <<lingo Block/Caption>>
-
-<<parsing-outer typeLower:"block" typeCap:"Block">>
+<dl>
+<dt><<lingo Pragma/Caption>></dt>
+<<rules pragma Pragma>>
+<dt><<lingo Inline/Caption>></dt>
+<<rules inline Inline>>
+<dt><<lingo Block/Caption>></dt>
+<<rules block Block>>
+</dl>
\ No newline at end of file