diff --git a/README.md b/README.md
index 486c9c0..b80b046 100644
--- a/README.md
+++ b/README.md
@@ -36,6 +36,7 @@ Available options:
 
 - timeout: How many milliseconds to wait after keydown before filtering the list.  Default is 0.
 - callback: A callback method which will be given the number of items left in the list.
+- selector: By default, the plugin will match the filter against the text of the `li`. If specifed, the selector will be applied to the `li` and the resulting text will be used instead. **WARNING:** Use of complex selectors may reduce performance significantly, especially in large lists!
 
 Example:
 
diff --git a/jquery.fastLiveFilter.js b/jquery.fastLiveFilter.js
index 141448e..bd53494 100644
--- a/jquery.fastLiveFilter.js
+++ b/jquery.fastLiveFilter.js
@@ -11,6 +11,7 @@ jQuery.fn.fastLiveFilter = function(list, options) {
 	options = options || {};
 	list = jQuery(list);
 	var input = this;
+	var lastFilter = '';
 	var timeout = options.timeout || 0;
 	var callback = options.callback || function() {};
 	
@@ -27,11 +28,15 @@ jQuery.fn.fastLiveFilter = function(list, options) {
 	input.change(function() {
 		// var startTime = new Date().getTime();
 		var filter = input.val().toLowerCase();
-		var li;
+		var li, innerText;
 		var numShown = 0;
 		for (var i = 0; i < len; i++) {
 			li = lis[i];
-			if ((li.textContent || li.innerText || "").toLowerCase().indexOf(filter) >= 0) {
+			innerText = !options.selector ? 
+				(li.textContent || li.innerText || "") : 
+				$(li).find(options.selector).text();
+			
+			if (innerText.toLowerCase().indexOf(filter) >= 0) {
 				if (li.style.display == "none") {
 					li.style.display = oldDisplay;
 				}
@@ -47,11 +52,12 @@ jQuery.fn.fastLiveFilter = function(list, options) {
 		// console.log('Search for ' + filter + ' took: ' + (endTime - startTime) + ' (' + numShown + ' results)');
 		return false;
 	}).keydown(function() {
-		// TODO: one point of improvement could be in here: currently the change event is
-		// invoked even if a change does not occur (e.g. by pressing a modifier key or
-		// something)
 		clearTimeout(keyTimeout);
-		keyTimeout = setTimeout(function() { input.change(); }, timeout);
+		keyTimeout = setTimeout(function() {
+			if( input.val() === lastFilter ) return;
+			lastFilter = input.val();
+			input.change();
+		}, timeout);
 	});
 	return this; // maintain jQuery chainability
 }