diff --git a/plugins/NerdPack.plg b/plugins/NerdPack.plg
index 945d471c..c296efbd 100644
--- a/plugins/NerdPack.plg
+++ b/plugins/NerdPack.plg
@@ -3,7 +3,7 @@
 <!DOCTYPE PLUGIN [
 <!ENTITY name      "NerdPack">
 <!ENTITY author    "dmacias72">
-<!ENTITY version   "2016.01.24">
+<!ENTITY version   "2016.01.25">
 <!ENTITY launch    "Settings/&name;">
 <!ENTITY gitURL    "https://raw.githubusercontent.com/&author;/unRAID-plugins/master">
 <!ENTITY pluginURL "&gitURL;/plugins/&name;.plg">
@@ -16,6 +16,10 @@
 <PLUGIN name="&name;" author="&author;" version="&version;" launch="&launch;" pluginURL="&pluginURL;">
 
 <CHANGES>
+###2016.01.25
+- Merge eschultz pull request
+- tweaks to tablesorter to restore saved filters 
+- minor optimizations
 ###2016.01.24
 - Merged eschultz's package repo and following fixes
 - Fixed first time running warnings about missing packages.json / desc files
diff --git a/plugins/NerdPack.xml b/plugins/NerdPack.xml
index 1fc4b8d5..b8fa534a 100644
--- a/plugins/NerdPack.xml
+++ b/plugins/NerdPack.xml
@@ -11,8 +11,12 @@ This plugin allows installation of extra packages, mostly CLI, for advanced user
 </Description>
 <Support>http://lime-technology.com/forum/index.php?topic=37541.0</Support>
 <Icon>https://raw.githubusercontent.com/dmacias72/unRAID-plugins/master/plugins/NerdPack.png</Icon>
-<Date>2016-01-24</Date>
+<Date>2016-01-25</Date>
 <Changes>
+###2016.01.25
+- Merge eschultz pull request
+- tweaks to tablesorter to restore saved filters 
+- minor optimizations
 ###2016.01.24
 - Merged eschultz's package repo and following fixes
 - Fixed first time running warnings about missing packages.json / desc files
diff --git a/source/NerdPack/usr/local/emhttp/plugins/NerdPack/NerdPack.page b/source/NerdPack/usr/local/emhttp/plugins/NerdPack/NerdPack.page
index 5a2d9609..66ed910a 100644
--- a/source/NerdPack/usr/local/emhttp/plugins/NerdPack/NerdPack.page
+++ b/source/NerdPack/usr/local/emhttp/plugins/NerdPack/NerdPack.page
@@ -27,7 +27,7 @@ Title="Nerd Pack"
 	</tbody>
 </table>
 
-<input onclick="packageQuery(1)" value="Check for Updates" type="button"><button class="reset" type="button" title="reset filters">Reset Filters</button>
+<input onclick="packageQuery(1)" value="Check for Updates" type="button"><input class="reset" type="button" title="reset filters" value="Reset Filters">
 : <input id="btnApply" type="button" value="Apply"><input type="button" value="Done" onClick="done()">
 <input type="hidden" name="#file" value="NerdPack/NerdPack.cfg">
 </form>
@@ -35,4 +35,4 @@ Title="Nerd Pack"
 <script type="text/javascript" src="/plugins/tablesorter/js/jquery.tablesorter.combined.min.js"></script>
 <script type="text/javascript" src="/plugins/tablesorter/js/parsers/parser-metric.min.js"></script>
 <script type="text/javascript" src="/webGui/javascript/jquery.switchbutton.js"></script>
-<script type="text/javascript" src="/plugins/NerdPack/js/jquery.NerdPack.js"></script>
\ No newline at end of file
+<script type="text/javascript" src="/plugins/NerdPack/js/jquery.NerdPack.js"></script>
diff --git a/source/NerdPack/usr/local/emhttp/plugins/NerdPack/js/jquery.NerdPack.js b/source/NerdPack/usr/local/emhttp/plugins/NerdPack/js/jquery.NerdPack.js
index 189e4597..20d0cd36 100644
--- a/source/NerdPack/usr/local/emhttp/plugins/NerdPack/js/jquery.NerdPack.js
+++ b/source/NerdPack/usr/local/emhttp/plugins/NerdPack/js/jquery.NerdPack.js
@@ -1,4 +1,22 @@
 $(function(){
+	// tablesorter options
+	$("#tblPackages").tablesorter({
+		sortList: [[0,0]],
+		widgets: ["saveSort", "filter", "stickyHeaders"],
+		widgetOptions: {
+			stickyHeaders_filteredToTop: true,
+			filter_hideEmpty: true,
+			filter_liveSearch: true,
+			filter_saveFilters: true,
+			filter_reset: ".reset",
+			filter_functions: {
+				".filter-version": true,
+				".filter-downloaded": true,
+				".filter-installed": true
+			}
+		}
+	});
+
 	// "uninstall package" switch and cookie
 	$("#uninstallpkg")
 		.switchButton({
@@ -23,6 +41,20 @@ $(function(){
 			$.cookie("nerdpack_packages_delete", $(this).prop("checked") ? "--delete" : "", { expires: 3650 });
 		});
 
+	// select all packages switch
+	$("#checkall")
+		.switchButton({
+			labels_placement: "right",
+			on_label: "Select All",
+			off_label: "Select All",
+			checked: $.cookie("nerdpack_checkall") == "yes"
+		})
+		.change(function () {
+			var myval = $(this).prop("checked");
+			$.cookie("nerdpack_checkall", myval ? "yes" : "no", { expires: 3650 });
+			$("#tblPackages tbody td:visible .pkgcheckbox").switchButton({checked: myval});
+		});
+
 	// set cookie on apply button press
 	$("#btnApply").click(function() {
 		checkDepends();
@@ -70,62 +102,29 @@ function packageQuery(force) {
 			"<td>"+data[i].size+"</td>"+ // package size
 			"<td>"+Downloaded+"</td>"+ // package installed
 			"<td>"+Installed+"</td>"+ // package installed
-			"<td><input class='pkgcheckbox' id='"+data[i].pkgname+"' type='checkbox'>"+
+			"<td><input class='pkgcheckbox' id='"+data[i].pkgname+"' type='checkbox' "+(data[i].config=="yes"?"checked":"")+">"+
 			"<input class='pkgvalue' type='hidden' id='"+data[i].pkgname+"_value' name='"+data[i].pkgnver+"' value='"+data[i].config+"'></td>"+
 			"</tr>");
-
-			$("#"+data[i].pkgname)
-				.switchButton({
-					labels_placement: "right",
-					on_label: "On",
-					off_label: "Off",
-					checked: data[i].config == "yes"
-				})
-				.change(function() {
-					$(this).parent().parent().find(".pkgvalue").val(this.checked ? "yes": "no");
-					if (this.checked)
-						checkDepends();
-					$("#btnApply").prop("disabled", false);
-				});
 		}
-		$("#tblPackages").trigger("update");
-		
-		// tablesorter options
-		$("#tblPackages").tablesorter({
-			sortList: [[0,0]],
-			widgets: ["saveSort", "filter", "stickyHeaders"],
-			widgetOptions: {
-				stickyHeaders_filteredToTop: true,
-				filter_hideEmpty: true,
-				filter_liveSearch: true,
-				filter_saveFilters: true,
-				filter_reset: ".reset",
-				filter_functions: {
-					".filter-version": true,
-					".filter-downloaded": true,
-					".filter-installed": true
-				}
-			}
-		});
 
-		// select all packages switch
-		$("#checkall")
+		// attach switch buttons to every package checkbox all at once
+		$(".pkgcheckbox")
 			.switchButton({
 				labels_placement: "right",
-				on_label: "Select All",
-				off_label: "Select All",
-				checked: $.cookie("nerdpack_checkall") == "yes"
+				on_label: "On",
+				off_label: "Off"
 			})
-			.change(function () {
-				var myval = $(this).prop("checked");
-				$.cookie("nerdpack_checkall", myval ? "yes" : "no", { expires: 3650 });
-				$(".pkgcheckbox").each(function() { // loop through each checkbox
-					$(this).switchButton({checked: myval});
-				});
-				$(".pkgvalue").each(function() { // loop through each value
-					$(this).val(myval ? "yes": "no");
-				});
+			.change(function() {
+				$(this).parent().parent().find(".pkgvalue").val(this.checked ? "yes": "no");
+				if (this.checked)
+					checkDepends();
+				$("#btnApply").prop("disabled", false);
 			});
+
+		// restore filters
+		var lastSearch = $("#tblPackages")[0].config.lastSearch;
+		$("#tblPackages").trigger("update");
+		$("#tblPackages").trigger("search", [lastSearch]);
 	});
 }
 
@@ -138,4 +137,4 @@ function checkDepends() {
 		$("#python").switchButton({checked: true});
 		$("#python", ".pkgvalue").val("yes");
 	}
-}
\ No newline at end of file
+}