diff --git a/features/searchPane/dataTables.searchPane.js b/features/searchPane/dataTables.searchPane.js
index 9a79956..7cdbf0f 100644
--- a/features/searchPane/dataTables.searchPane.js
+++ b/features/searchPane/dataTables.searchPane.js
@@ -2,7 +2,7 @@
 // - Styling for selected
 // - Styling for container / header
 // - Styling for clear option
-// - State saving integration
+// - Rebuild API method
 
 (function(factory) {
 	if (typeof define === 'function' && define.amd) {
@@ -72,8 +72,6 @@
 				container( this.s.dt ) :
 				container;
 			
-				console.log( host );
-			
 			if ( this.c.insert === 'prepend' ) {
 				$(this.dom.container).prependTo( host );
 			}
@@ -130,10 +128,9 @@
 			// On initialisation, do we need to set a filtering value from a
 			// saved state or init option?
 			var search = column.search();
-			search =
-				search.length && search[0]
-					? search[0].substr(1, search[0].length - 2).split('|')
-					: [];
+			search = search
+				? search.substr(1, search.length - 2).split('|')
+				: [];
 
 			var data = column
 				.data()
@@ -154,8 +151,12 @@
 								.html(bins[data[i]])
 						);
 
-					if ($.inArray(data[i], search) !== -1) {
-						li.addClass(itemClasses.selected);
+					if ( search.length ) {
+						var escaped = $.fn.dataTable.util.escapeRegex( data[i] );
+
+						if ($.inArray(escaped, search) !== -1) {
+							li.addClass(itemClasses.selected);
+						}
 					}
 
 					list.append(li);
@@ -207,9 +208,9 @@
 				table
 					.column(pane.data('column'))
 					.search(
-						$.map(filters, function(filter) {
+						'^'+$.map(filters, function(filter) {
 							return $.fn.dataTable.util.escapeRegex( $(filter).data('filter') );
-						}).join('|'),
+						}).join('|')+'$',
 						true,
 						false
 					)
diff --git a/features/searchPane/index.html b/features/searchPane/index.html
index bfe061c..a03dea0 100644
--- a/features/searchPane/index.html
+++ b/features/searchPane/index.html
@@ -23,7 +23,8 @@ body {
 		<script type="text/javascript" charset="utf-8">
 			$(document).ready( function () {
 				$('#example').DataTable( {
-					searchPane: true
+					searchPane: true,
+					stateSave: true
 				} );
 			} );
 		</script>