diff --git a/core/modules/filters/search.js b/core/modules/filters/search.js
index a0826f44a..933cf7419 100644
--- a/core/modules/filters/search.js
+++ b/core/modules/filters/search.js
@@ -17,10 +17,18 @@ Export our filter function
 */
 exports.search = function(source,operator,options) {
 	var invert = operator.prefix === "!";
-	return options.wiki.search(operator.operand,{
-		source: source,
-		invert: invert
-	});
+	if(operator.suffix) {
+		return options.wiki.search(operator.operand,{
+			source: source,
+			invert: invert,
+			field: operator.suffix
+		});
+	} else {
+		return options.wiki.search(operator.operand,{
+			source: source,
+			invert: invert
+		});
+	}
 };
 
 })();
diff --git a/core/modules/wiki.js b/core/modules/wiki.js
index 455c29e09..bc0d4ee83 100755
--- a/core/modules/wiki.js
+++ b/core/modules/wiki.js
@@ -969,6 +969,7 @@ Options available:
 	invert: If true returns tiddlers that do not contain the specified string
 	caseSensitive: If true forces a case sensitive search
 	literal: If true, searches for literal string, rather than separate search terms
+	field: If specified, restricts the search to the specified field
 */
 exports.search = function(text,options) {
 	options = options || {};
@@ -1007,13 +1008,17 @@ exports.search = function(text,options) {
 		var contentTypeInfo = $tw.config.contentTypeInfo[tiddler.fields.type] || $tw.config.contentTypeInfo["text/vnd.tiddlywiki"],
 			match;
 		for(var t=0; t<searchTermsRegExps.length; t++) {
-			// Search title, tags and body
 			match = false;
-			if(contentTypeInfo.encoding === "utf8") {
-				match = match || searchTermsRegExps[t].test(tiddler.fields.text);
+			if(options.field) {
+				match = searchTermsRegExps[t].test(tiddler.getFieldString(options.field));
+			} else {
+				// Search title, tags and body
+				if(contentTypeInfo.encoding === "utf8") {
+					match = match || searchTermsRegExps[t].test(tiddler.fields.text);
+				}
+				var tags = tiddler.fields.tags ? tiddler.fields.tags.join("\0") : "";
+				match = match || searchTermsRegExps[t].test(tags) || searchTermsRegExps[t].test(tiddler.fields.title);
 			}
-			var tags = tiddler.fields.tags ? tiddler.fields.tags.join("\0") : "";
-			match = match || searchTermsRegExps[t].test(tags) || searchTermsRegExps[t].test(tiddler.fields.title);
 			if(!match) {
 				return false;
 			}
diff --git a/editions/tw5.com/tiddlers/filters/FilterOperator search.tid b/editions/tw5.com/tiddlers/filters/FilterOperator search.tid
index a6e3c9f71..85910703a 100644
--- a/editions/tw5.com/tiddlers/filters/FilterOperator search.tid	
+++ b/editions/tw5.com/tiddlers/filters/FilterOperator search.tid	
@@ -7,8 +7,11 @@ type: text/vnd.tiddlywiki
 
 The ''search'' filter operator filters the current list to leave only those tiddlers that include the operand text in their title, body or tags. Preceding the operator with `!` returns all tiddlers that do not include the specified text. The search is case-insenstive.
 
+Optionally, a field can be specified to restrict the search.
+
 For example:
 
 |!Filter String |!Description |
 |`[search[alsatian]]` |Returns a list of the tiddlers containing the text "alsatian" |
 |`[all[shadows]search[alsatian]]` |Returns a list of the shadow tiddlers containing the text "alsatian" |
+|`[search:caption[spaniel]]` |Returns a list of the tiddlers containing the text "spaniel" in their caption field |