From f096b0d4e16a23f7b8a1a975fd21450f146da48e Mon Sep 17 00:00:00 2001
From: Christian 'ketura' McCarty <hyperlink.teltura@gmail.com>
Date: Tue, 12 Nov 2024 19:03:36 -0600
Subject: [PATCH] Deckbuilder Format Overhaul

- Fleshed out deckbuilder format/block/set selection.  The deck format selection now filters what block/set will show up in the card filters in the right pane.
- Fixed Ring-bearer/One Ring filtering not working.  Further fleshed out Ring/Bearer interaction so that other filters may now be used.
---
 .../async/handler/DeckRequestHandler.java     |   11 +-
 .../async/handler/HallRequestHandler.java     |    4 +-
 .../src/main/web/css/gemp-001/cardFilter.css  |    8 +
 .../src/main/web/deckBuild.html               |    2 +-
 .../src/main/web/js/gemp-022/cards/Card.js    |    2 +
 .../main/web/js/gemp-022/cards/CardFilter.js  | 1796 ++++++------
 .../main/web/js/gemp-022/deckBuildingUi.js    | 2418 +++++++++--------
 .../src/main/resources/lotrFormats.hjson      |  396 ++-
 .../src/main/resources/setConfig.hjson        | 1154 ++++----
 .../com/gempukku/lotro/common/JSONDefs.java   |   10 +-
 .../lotro/game/LotroCardBlueprintLibrary.java |    2 +-
 .../com/gempukku/lotro/game/LotroFormat.java  |    4 +-
 .../lotro/game/SortAndFilterCards.java        |   59 +-
 .../game/formats/DefaultLotroFormat.java      |   74 +-
 .../game/formats/LotroFormatLibrary.java      |    5 +
 15 files changed, 3213 insertions(+), 2732 deletions(-)

diff --git a/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/DeckRequestHandler.java b/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/DeckRequestHandler.java
index 5b38c29f8..772b09a37 100644
--- a/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/DeckRequestHandler.java
+++ b/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/DeckRequestHandler.java
@@ -108,13 +108,12 @@ public class DeckRequestHandler extends LotroServerRequestHandler implements Uri
                 json = JsonUtils.Serialize(data);
             }
             else {
-                Map<String, LotroFormat> formats = _formatLibrary.getHallFormats();
+                JSONDefs.FullFormatReadout data = new JSONDefs.FullFormatReadout();
+                data.Formats = _formatLibrary.getAllFormats().values().stream()
+                        .map(LotroFormat::Serialize)
+                        .collect(Collectors.toMap(x-> x.code, x-> x));
 
-                Object[] output = formats.entrySet().stream()
-                        .map(x -> new JSONDefs.ItemStub(x.getKey(), x.getValue().getName()))
-                        .toArray();
-
-                json = JsonUtils.Serialize(output);
+                json = JsonUtils.Serialize(data);
             }
 
             responseWriter.writeJsonResponse(json);
diff --git a/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/HallRequestHandler.java b/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/HallRequestHandler.java
index 95192479e..dfd5748cb 100644
--- a/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/HallRequestHandler.java
+++ b/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/HallRequestHandler.java
@@ -351,8 +351,8 @@ public class HallRequestHandler extends LotroServerRequestHandler implements Uri
         result.append("<b>" + lotroFormat.getName() + "</b>");
         result.append("<ul>");
         result.append("<li>valid sets: ");
-        for (Integer integer : lotroFormat.getValidSets())
-            result.append(integer + ", ");
+        for (String setCode : lotroFormat.getValidSets())
+            result.append(setCode + ", ");
         result.append("</li>");
         result.append("<li>sites from block: " + lotroFormat.getSiteBlock().getHumanReadable() + "</li>");
         result.append("<li>Ring-bearer skirmish can be cancelled: " + (lotroFormat.canCancelRingBearerSkirmish() ? "yes" : "no") + "</li>");
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/css/gemp-001/cardFilter.css b/gemp-lotr/gemp-lotr-async/src/main/web/css/gemp-001/cardFilter.css
index 7a6bb05b0..79c33d182 100644
--- a/gemp-lotr/gemp-lotr-async/src/main/web/css/gemp-001/cardFilter.css
+++ b/gemp-lotr/gemp-lotr-async/src/main/web/css/gemp-001/cardFilter.css
@@ -8,6 +8,14 @@
 	font-size: 80%;
 }
 
+.filterInput {
+	max-width: 100px;
+}
+
+#nameInput, #gametextInput {
+	max-width: 230px;
+}
+
 #resetAdvancedFiltersButton, #resetAllFiltersButton {
 	font-size: 95% !important;
 }
\ No newline at end of file
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/deckBuild.html b/gemp-lotr/gemp-lotr-async/src/main/web/deckBuild.html
index a837c4e26..2ff487d5a 100644
--- a/gemp-lotr/gemp-lotr-async/src/main/web/deckBuild.html
+++ b/gemp-lotr/gemp-lotr-async/src/main/web/deckBuild.html
@@ -97,7 +97,7 @@
 			</button>
 
 			<select id="formatSelect" style="float: right; width: 200px;">
-				<option value="fotr_block">Fellowship Block</option>
+				<option value="rev_tow_sta">Anything Goes</option>
 			</select>
 
 			<button id="notesBut" title="Add/Edit Notes" class="menu-button">
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/cards/Card.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/cards/Card.js
index 930c1ea41..f50914d96 100644
--- a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/cards/Card.js
+++ b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/cards/Card.js
@@ -300,6 +300,8 @@ class Card {
             return (cardNo == 1);
         if (setNo == 101 || setNo == 151)
             return (cardNo >= 57 && cardNo <= 64);
+        if (setNo == 102)
+            return (cardNo >= 67 && cardNo <= 73);
 
         return false;
     }
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/cards/CardFilter.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/cards/CardFilter.js
index e1dbfe2fa..90a234afe 100644
--- a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/cards/CardFilter.js
+++ b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/cards/CardFilter.js
@@ -1,902 +1,1010 @@
 var CardFilter = Class.extend({
-    clearCollectionFunc: null,
-    addCardFunc: null,
-    finishCollectionFunc: null,
-    getCollectionFunc: null,
+	clearCollectionFunc: null,
+	addCardFunc: null,
+	finishCollectionFunc: null,
+	getCollectionFunc: null,
 
-    collectionType: null,
+	collectionType: null,
 
-    filter: null,
-    start: 0,
-    count: 12,
+	filter: null,
+	start: 0,
+	count: 12,
 
-    pageDiv: null,
-    navigationDiv: null,
-    advancedFilterDiv: null,
-    filtersDiv: null,
-    fullFilterDiv: null,
-    filterDiv: null,
-    collectionDiv: null,
+	pageDiv: null,
+	navigationDiv: null,
+	advancedFilterDiv: null,
+	filtersDiv: null,
+	fullFilterDiv: null,
+	filterDiv: null,
+	collectionDiv: null,
 
-    previousPageBut: null,
-    nextPageBut: null,
-    countSlider: null,
+	previousPageBut: null,
+	nextPageBut: null,
+	countSlider: null,
 
-    sideLabel:null,
-    sideSelect:null,
-    setLabel:null,
-    setSelect: null,
-    cardTypeLabel:null,
-    cardTypeSelect:null,
-    keywordLabel:null,
-    keywordSelect:null,
-    raceLabel:null,
-    raceSelect:null,
-    itemClassLabel:null,
-    itemClassSelect:null,
-    phaseLabel:null,
-    phaseSelect:null,
-    rarityLabel:null,
-    raritySelect:null,
-    
-    nameLabel: null,
-    nameInput: null,
-    gametextLabel: null,
-    gametextInput: null,
-    
-    productLabel:null,
-    productSelect:null,
-    sortLabel:null,
-    sortSelect:null,
-    
-    twilightLabel:null,
-    twilightCompareSelect:null,
-    twilightValueInput:null,
-    strengthLabel:null,
-    strengthCompareSelect:null,
-    strengthValueInput:null,
-    vitalityLabel:null,
-    vitalityCompareSelect:null,
-    vitalityValueInput:null,
-    signetLabel:null,
-    signetSelect:null,
-    
-    siteNumberLabel:null,
-    siteNumberCompareSelect:null,
-    siteNumberValueInput:null,
-    resistanceLabel:null,
-    resistanceCompareSelect:null,
-    resistanceValueInput:null,
-    
-    pauseUpdates: false,
-    
+	sideLabel:null,
+	sideSelect:null,
+	blockLabel:null,
+	blockSelect: null,
+	setLabel:null,
+	setSelect: null,
+	cardTypeLabel:null,
+	cardTypeSelect:null,
+	keywordLabel:null,
+	keywordSelect:null,
+	raceLabel:null,
+	raceSelect:null,
+	itemClassLabel:null,
+	itemClassSelect:null,
+	phaseLabel:null,
+	phaseSelect:null,
+	rarityLabel:null,
+	raritySelect:null,
+	
+	nameLabel: null,
+	nameInput: null,
+	gametextLabel: null,
+	gametextInput: null,
+	
+	productLabel:null,
+	productSelect:null,
+	sortLabel:null,
+	sortSelect:null,
+	
+	twilightLabel:null,
+	twilightCompareSelect:null,
+	twilightValueInput:null,
+	strengthLabel:null,
+	strengthCompareSelect:null,
+	strengthValueInput:null,
+	vitalityLabel:null,
+	vitalityCompareSelect:null,
+	vitalityValueInput:null,
+	signetLabel:null,
+	signetSelect:null,
+	
+	siteNumberLabel:null,
+	siteNumberCompareSelect:null,
+	siteNumberValueInput:null,
+	resistanceLabel:null,
+	resistanceCompareSelect:null,
+	resistanceValueInput:null,
+	
+	initialStartup: false,
+	pauseUpdates: false,
+	
+	currentFormat: null,
+	blocks: null,
+	overrideFilter: "",
+	
 
-    init: function (pageElem, getCollectionFunc, clearCollectionFunc, addCardFunc, finishCollectionFunc) {
-        this.getCollectionFunc = getCollectionFunc;
-        this.clearCollectionFunc = clearCollectionFunc;
-        this.addCardFunc = addCardFunc;
-        this.finishCollectionFunc = finishCollectionFunc;
+	init: function (pageElem, getCollectionFunc, clearCollectionFunc, addCardFunc, finishCollectionFunc) {
+		this.initialStartup = false;
+		
+		this.getCollectionFunc = getCollectionFunc;
+		this.clearCollectionFunc = clearCollectionFunc;
+		this.addCardFunc = addCardFunc;
+		this.finishCollectionFunc = finishCollectionFunc;
 
-        this.filter = "";
+		this.filter = "";
 
-        this.buildUi(pageElem);
-        this.filter = this.calculateDeckFilter();
-        this.getCollection();
-    },
+		this.buildUi(pageElem);
+		this.filter = this.calculateDeckFilter();
+	},
+	
+	setFilterOverride(override) {
+		console.log("Override from deckbuilder");
+		this.initialStartup = true;
+		this.overrideFilter = override; 
+		this.filter = this.calculateDeckFilter(this.overrideFilter);
+		this.start = 0;
+		$("#resetAllFiltersButton").click();
+		this.getCollection(); 
+	},
 
-    enableDetailFilters: function (enable) {
-        $("#culture-buttons").buttonset("option", "disabled", !enable);
-        $("#cardType").prop("disabled", !enable);
-        $("#keyword").prop("disabled", !enable);
-        $("#race").prop("disabled", !enable);
-        $("#itemClass").prop("disabled", !enable);
-        $("#phase").prop("disabled", !enable);
-    },
+	setType: function (typeValue) {
+		$("#productSelect").val(typeValue);
+	},
 
-    setFilter: function (filter) {
-        this.filter = filter;
+	buildUi: function (pageElem) {
+		var that = this;
 
-        this.start = 0;
-        this.getCollection();
-    },
+		this.pageDiv = $("<div id='filter-main' style='display:flex;flex-direction:column;align-items:stretch;'></div>");
+		this.navigationDiv = $("<div id='card-navigation' style='display: flex; flex-direction: row; gap: 2px; align-items: center;'></div>");
+		this.pageDiv.append(this.navigationDiv);
+		pageElem.append(this.pageDiv);
 
-    setType: function (typeValue) {
-        $("#productSelect").val(typeValue);
-    },
+		this.previousPageBut = $("<button id='previousPage' class='navigation-butt'></button>").button({
+			text: false,
+			icons: {
+				primary: "ui-icon-circle-triangle-w"
+			},
+			disabled: true
+		}).click(
+			function () {
+				that.disableNavigation();
+				that.start -= that.count;
+				that.getCollection();
+			});
 
-    buildUi: function (pageElem) {
-        var that = this;
+		this.nextPageBut = $("<button id='nextPage' class='navigation-butt'></button>").button({
+			text: false,
+			icons: {
+				primary: "ui-icon-circle-triangle-e"
+			},
+			disabled: true
+		}).click(
+			function () {
+				that.disableNavigation();
+				that.start += that.count;
+				that.getCollection();
+			});
 
-        this.pageDiv = $("<div id='filter-main' style='display:flex;flex-direction:column;align-items:stretch;'></div>");
-        this.navigationDiv = $("<div id='card-navigation' style='display: flex; flex-direction: row; gap: 2px; align-items: center;'></div>");
-        this.pageDiv.append(this.navigationDiv);
-        pageElem.append(this.pageDiv);
+		this.countSlider = $("<div id='countSlider' style='flex-grow:1;'></div>").slider({
+			value: 18,
+			min: 4,
+			max: 40,
+			step: 1,
+			disabled: true,
+			slide: function (event, ui) {
+				that.start = 0;
+				that.count = ui.value;
+				that.getCollection();
+			}
+		});
 
-        this.previousPageBut = $("<button id='previousPage' class='navigation-butt'></button>").button({
-            text: false,
-            icons: {
-                primary: "ui-icon-circle-triangle-w"
-            },
-            disabled: true
-        }).click(
-            function () {
-                that.disableNavigation();
-                that.start -= that.count;
-                that.getCollection();
-            });
+		this.navigationDiv.append(this.previousPageBut);
+		this.navigationDiv.append(this.countSlider);
+		this.navigationDiv.append(this.nextPageBut);
+		
+		this.fullFilterDiv = $("<div id='filter-inputs' style='display:flex;flex-wrap:wrap;'></div>");
+		
+		this.sideLabel = $("<label for='sideSelect' class='filterLabel'>Side:</label>");
+		this.sideSelect = $("<select id='sideSelect' class='filterInput'>"
+			+ "<option value='' selected='selected'>Any</option>"
+			+ "<option value='SHADOW'>Shadow</option>"
+			+ "<option value='FREE_PEOPLES'>Free Peoples</option>"
+			+ "<option value='NONE'>Neither</option>"
+			+ "</select>");
+		
+		this.blockLabel = $("<label for='blockSelect' class='filterLabel'>Block:</label>");
+		this.blockSelect = $("<select id='blockSelect' class='filterInput'>"
+			+ "<option value='0-33,50-200' selected='selected'>Any</option>"
+			+ "</select>");
+		
+		this.setLabel = $("<label for='setSelect' class='filterLabel'>Set:</label>");
+		this.setSelect = $("<select id='setSelect' class='filterInput'>"
+			+ "<option value='0-34,50-200' selected='selected'>Any</option>"
+			+ "</select>");
 
-        this.nextPageBut = $("<button id='nextPage' class='navigation-butt'></button>").button({
-            text: false,
-            icons: {
-                primary: "ui-icon-circle-triangle-e"
-            },
-            disabled: true
-        }).click(
-            function () {
-                that.disableNavigation();
-                that.start += that.count;
-                that.getCollection();
-            });
+		this.cardTypeLabel = $("<label for='cardTypeSelect' class='filterLabel'>Card&nbsp;Type:</label>");
+		this.cardTypeSelect = $("<select id='cardTypeSelect' class='filterInput'>"
+			+ "<option value='' selected='selected'>Any</option>"
+			+ "<option value='COMPANION,ALLY,MINION'>Characters</option>"
+			+ "<option value='POSSESSION,ARTIFACT'>Items</option>"
+			+ "<option value='SITE'>Sites</option>"
+			+ "<option value='ALLY'>Allies</option>"
+			+ "<option value='ARTIFACT'>Artifacts</option>"
+			+ "<option value='COMPANION'>Companions</option>"
+			+ "<option value='CONDITION'>Conditions</option>"
+			+ "<option value='EVENT'>Events</option>"
+			+ "<option value='FOLLOWER'>Followers</option>"
+			+ "<option value='MINION'>Minions</option>"
+			+ "<option value='POSSESSION'>Possessions</option>"
+			+ "</select>");
+		
+		this.keywordLabel = $("<label for='keywordSelect' class='filterLabel'>Keyword:</label>");
+		this.keywordSelect = $("<select id='keywordSelect' class='filterInput'>"
+			+ "<option value='' selected='selected'>Any</option>"
+			+ "<option value='ARCHER'>Archer</option>"
+			+ "<option value='BATTLEGROUND'>Battleground</option>"
+			+ "<option value='BESIEGER'>Besieger</option>"
+			+ "<option value='CORSAIR'>Corsair</option>"
+			+ "<option value='DWELLING'>Dwelling</option>"
+			+ "<option value='EASTERLING'>Easterling</option>"
+			+ "<option value='ENDURING'>Enduring</option>"
+			+ "<option value='ENGINE'>Engine</option>"
+			+ "<option value='FIERCE'>Fierce</option>"
+			+ "<option value='FOREST'>Forest</option>"
+			+ "<option value='FORTIFICATION'>Fortification</option>"
+			+ "<option value='HUNTER'>Hunter</option>"
+			+ "<option value='KNIGHT'>Knight</option>"
+			+ "<option value='LURKER'>Lurker</option>"
+			+ "<option value='MACHINE'>Machine</option>"
+			+ "<option value='MARSH'>Marsh</option>"
+			+ "<option value='MOUNTAIN'>Mountain</option>"
+			+ "<option value='MUSTER'>Muster</option>"
+			+ "<option value='PIPEWEED'>Pipeweed</option>"
+			+ "<option value='PLAINS'>Plains</option>"
+			+ "<option value='RANGER'>Ranger</option>"
+			+ "<option value='RING_BOUND'>Ring-bound</option>"
+			+ "<option value='RIVER'>River</option>"
+			+ "<option value='SEARCH'>Search</option>"
+			+ "<option value='SOUTHRON'>Southron</option>"
+			+ "<option value='SPELL'>Spell</option>"
+			+ "<option value='STEALTH'>Stealth</option>"
+			+ "<option value='TALE'>Tale</option>"
+			+ "<option value='TENTACLE'>Tentacle</option>"
+			+ "<option value='TRACKER'>Tracker</option>"
+			+ "<option value='TWILIGHT'>Twilight</option>"
+			+ "<option value='UNDERGROUND'>Underground</option>"
+			+ "<option value='UNHASTY'>Unhasty</option>"
+			+ "<option value='VALIANT'>Valiant</option>"
+			+ "<option value='VILLAGER'>Villager</option>"
+			+ "<option value='WARG_RIDER'>Warg-rider</option>"
+			+ "<option value='WEATHER'>Weather</option>"
+			//Additional Hobbit Draft keyword
+			+ "<option value='WISE'>Wise</option>"
+			+ "</select>");
+		
+		this.raceLabel = $("<label for='raceSelect' class='filterLabel'>Race:</label>");
+		this.raceSelect = $("<select id='raceSelect' class='filterInput'>"
+			+ "<option value='' selected='selected'>Any</option>"
+			+ "<option value='BALROG'>Balrog</option>"
+			+ "<option value='CREATURE'>Creature</option>"
+			+ "<option value='CROW'>Crow</option>"
+			+ "<option value='DRAGON'>Dragon</option>"
+			+ "<option value='DWARF'>Dwarf</option>"
+			+ "<option value='EAGLE'>Eagle</option>"
+			+ "<option value='ELF'>Elf</option>"
+			+ "<option value='ENT'>Ent</option>"
+			+ "<option value='GIANT'>Giant</option>"
+			+ "<option value='HALF_TROLL'>Half-troll</option>"
+			+ "<option value='HOBBIT'>Hobbit</option>"
+			+ "<option value='MAIA'>Maia</option>"
+			+ "<option value='MAN'>Man</option>"
+			+ "<option value='NAZGUL'>Nazgul</option>"
+			+ "<option value='ORC'>Orc</option>"
+			+ "<option value='SPIDER'>Spider</option>"
+			+ "<option value='TREE'>Tree</option>"
+			+ "<option value='TROLL'>Troll</option>"
+			+ "<option value='URUK_HAI'>Uruk-hai</option>"
+			+ "<option value='WARG'>Warg</option>"
+			+ "<option value='WIZARD'>Wizard</option>"
+			+ "<option value='WRAITH'>Wraith</option>"
+			+ "</select>");
+		
+		this.itemClassLabel = $("<label for='itemClassSelect' class='filterLabel'>Item Class:</label>");
+		this.itemClassSelect = $("<select id='itemClassSelect' class='filterInput'>"
+			+ "<option value='' selected='selected'>Any</option>"
+			+ "<option value='ARMOR'>Armor</option>"
+			+ "<option value='BOX'>Box</option>"
+			+ "<option value='BRACERS'>Bracers</option>"
+			+ "<option value='BROOCH'>Brooch</option>"
+			+ "<option value='CLOAK'>Cloak</option>"
+			+ "<option value='GAUNTLETS'>Gauntlets</option>"
+			+ "<option value='HAND_WEAPON'>Hand Weapon</option>"
+			+ "<option value='HELM'>Helm</option>"
+			+ "<option value='HORN'>Horn</option>"
+			+ "<option value='MOUNT'>Mount</option>"
+			+ "<option value='PALANTIR'>Palantir</option>"
+			+ "<option value='PHIAL'>Phial</option>"
+			+ "<option value='PIPE'>Pipe</option>"
+			+ "<option value='PONY'>Pony</option>"
+			+ "<option value='RANGED_WEAPON'>Ranged Weapon</option>"
+			+ "<option value='RING'>Ring</option>"
+			+ "<option value='SHIELD'>Shield</option>"
+			+ "<option value='STAFF'>Staff</option>"
+			+ "<option value='CLASSLESS'>Classless</option>"
+			+ "</select>");
+		
+		
+		this.phaseLabel = $("<label for='phaseSelect' class='filterLabel'>Phase:</label>");
+		this.phaseSelect = $("<select id='phaseSelect' class='filterInput'>"
+			+ "<option value='' selected='selected'>Any</option>"
+			+ "<option value='FELLOWSHIP'>Fellowship</option>"
+			+ "<option value='SHADOW'>Shadow</option>"
+			+ "<option value='MANEUVER'>Maneuver</option>"
+			+ "<option value='ARCHERY'>Archery</option>"
+			+ "<option value='ASSIGNMENT'>Assignment</option>"
+			+ "<option value='SKIRMISH'>Skirmish</option>"
+			+ "<option value='REGROUP'>Regroup</option>"
+			+ "<option value='RESPONSE'>Response</option>"
+			+ "</select>");
+	   
 
-        this.countSlider = $("<div id='countSlider' style='flex-grow:1;'></div>").slider({
-            value: 18,
-            min: 4,
-            max: 40,
-            step: 1,
-            disabled: true,
-            slide: function (event, ui) {
-                that.start = 0;
-                that.count = ui.value;
-                that.getCollection();
-            }
-        });
+		this.nameLabel = $("<label for='nameInput' class='filterLabel'>Name&nbsp;contains:</label>");
+		this.nameInput = $("<input id='nameInput' type='text' maxlength='100' class='filterInput' style='width: 250px;'>");
+		
+		this.gametextLabel = $("<label for='gametextInput' class='filterLabel'>Game&nbsp;Text&nbsp;contains:</label>");
+		this.gametextInput = $("<input id='gametextInput' type='text' maxlength='100' class='filterInput' style='width: 250px;'>");
+		
+		this.generateNumericComparator("twilight", "Twilight");
+		this.generateNumericComparator("strength", "Strength");
+		this.generateNumericComparator("vitality", "Vitality");
+		this.generateNumericComparator("siteNumber", "Site Number");
+		this.generateNumericComparator("resistance", "Resistance");
+		
+		this.signetLabel = $("<label for='signetSelect' class='filterLabel'>Signet:</label>");
+		this.signetSelect = $("<select id='signetSelect' class='filterInput'>"
+			+ "<option value='' selected='selected'>Any</option>"
+			+ "<option value='ARAGORN'>Aragorn</option>"
+			+ "<option value='FRODO'>Frodo</option>"
+			+ "<option value='GANDALF'>Gandalf</option>"
+			+ "<option value='THEODEN'>Theoden</option>"
+			+ "</select>");
+		
+		this.productLabel = $("<label for='productSelect' class='filterLabel'>Product:</label>");
+		this.productSelect = $("<select id='productSelect' class='filterInput'>"
+			+ "<option value='' selected='selected'>Any</option>"
+			+ "<option value='pack'>Packs</option>"
+			+ "<option value='card'>Cards</option>"
+			+ "<option value='foil'>Foils</option>"
+			+ "<option value='nonFoil'>Non-foils</option>"
+			+ "<option value='tengwar'>Tengwar</option>"
+			+ "</select>");
+		
+		this.sortLabel = $("<label for='sortSelect' class='filterLabel'>Sort by:</label>");
+		this.sortSelect = $("<select id='sortSelect' class='filterInput'>"
+			+ "<option value='name' selected='selected'>Name</option>"
+			+ "<option value='twilight,name'>Twilight</option>"
+			+ "<option value='siteNumber,name'>Site Number</option>"
+			+ "<option value='strength,name'>Strength</option>"
+			+ "<option value='vitality,name'>Vitality</option>"
+			+ "<option value='cardType,name'>Card Type</option>"
+			+ "<option value='culture,name'>Culture</option>"
+			+ "</select>");
+		
+		this.rarityLabel = $("<label for='raritySelect' class='filterLabel'>Rarity:</label>");
+		this.raritySelect = $("<select id='raritySelect' class='filterInput'>"
+			+ "<option value='' selected='selected'>Any</option>"
+			+ "<option value='R'>Rare</option>"
+			+ "<option value='U'>Uncommon</option>"
+			+ "<option value='C'>Common</option>"
+			+ "<option value='A'>Alternate Image</option>"
+			+ "<option value='P'>Promo</option>"
+			+ "<option value='X'>Rare+</option>"
+			+ "<option value='S'>Fixed</option>"
+			+ "<option value='C,U,P,S'>Poorman's</option>"
+			+ "</select>");
+		
+		this.resetAdvancedFiltersButton = $("<button id='resetAdvancedFiltersButton' class='ui-button-icon-primary'>Reset advanced filters only</button>").button();
+		this.resetAllFiltersButton = $("<button id='resetAllFiltersButton' class='ui-button-icon-primary'>Reset all filters</button>").button();
+		
+		var genFilterTD = function(element, params) {
+			if(params !== undefined) 
+				return '<td ' + params + '>' + element[0].outerHTML + '</td>';
+			return '<td>' + element[0].outerHTML + '</td>';
+		};
+		
+		var genFilterTDPair = function(...elements) {
+			let cell = '<td>';
+			elements.forEach(function(item) {
+			   cell += item[0].outerHTML; 
+			});
+			return cell + "</td>"
+		};
+		
+		var genFilterTR = function(...elements) {
+			let row = '<tr>';
+			elements.forEach(function(item) {
+			   row += genFilterTD(item); 
+			});
+			return row + "</tr>"
+		};
+		
+		var genFilterTRPair = function(label, field) {
+			let row = '<tr>';
+			row += genFilterTD(label);
+			row += genFilterTD(field, "colspan='3'");
+			return row + "</tr>"
+		};
+		
+		var genFilterTRSolo = function(message, wrapperClass) {
+			return '<tr><td colspan="4"><div class="' + wrapperClass + '">' + message + '</div></td></tr>'
+		};
+		
+		var filterTable = $("<table id='filterTable' />");
+		filterTable.append(genFilterTR(this.productLabel, this.productSelect, this.rarityLabel, this.raritySelect));
+		filterTable.append(genFilterTR(this.blockLabel, this.blockSelect, this.setLabel, this.setSelect));
+		filterTable.append(genFilterTR(this.sideLabel, this.sideSelect, this.sortLabel, this.sortSelect));
+		filterTable.append(genFilterTRPair(this.cardTypeLabel, this.cardTypeSelect));
+		
+		filterTable.append(genFilterTRSolo("Advanced filters (<a target='_blank' href='https://wiki.lotrtcgpc.net/wiki/Special:RunQuery/CardSearch'>See more on the Wiki.</a>)", "cardFilterText"));
+		filterTable.append(genFilterTRPair(this.nameLabel, this.nameInput));
+		filterTable.append(genFilterTRPair(this.gametextLabel, this.gametextInput));
 
-        this.navigationDiv.append(this.previousPageBut);
-        this.navigationDiv.append(this.countSlider);
-        this.navigationDiv.append(this.nextPageBut);
-        
-        this.fullFilterDiv = $("<div id='filter-inputs' style='display:flex;flex-wrap:wrap;'></div>");
-        
-        this.sideLabel = $("<label for='sideSelect' class='filterLabel'>Side:</label>");
-        this.sideSelect = $("<select id='sideSelect' class='filterInput'>"
-            + "<option value='' selected='selected'>Any</option>"
-            + "<option value='SHADOW'>Shadow</option>"
-            + "<option value='FREE_PEOPLES'>Free Peoples</option>"
-            + "<option value='NONE'>Neither</option>"
-            + "</select>");
-        
-        this.setLabel = $("<label for='setSelect' class='filterLabel'>Format/Set:</label>");
-        this.setSelect = $("<select id='setSelect' class='filterInput'>"
-            + "<option value='0-34,50-200' selected='selected'>All Sets</option>"
-            + "<option value='0-19'>Official Decipher Sets</option>"
-            + "<option value='30-33'>The Hobbit Sets</option>"
-            + "<option value='50-69,100'>Player's Council Errata</option>"
-            + "<option value='100-149'>Player's Council VSets</option>"
-            + "<option value='50-69,100-149'>All Player's Council Cards</option>"
-            + "<option disabled>----------</option>"
-            + "<option value='fotr_block'>Fellowship Block</option>"
-            + "<option value='pc_fotr_block'>Fellowship Block (PC)</option>"
-            + "<option value='ttt_block'>Towers Block</option>"
-            + "<option value='king_block'>King Block</option>"
-            + "<option value='war_block'>War of the Ring Block</option>"
-            + "<option value='hunter_block'>Hunters Block</option>"
-            + "<option value='towers_standard'>Towers Standard</option>"
-            + "<option value='ts_reflections'>Enhanced Towers Standard</option>"            
-            + "<option value='rotk_sta'>King Standard</option>"
-            + "<option value='movie'>Movie Block</option>"
-            + "<option value='pc_movie'>Movie Block (PC)</option>"
-            + "<option value='war_standard'>War of the Ring standard</option>"
-            + "<option value='standard'>Standard</option>"
-            + "<option value='expanded'>Expanded</option>"
-            + "<option value='pc_expanded'>Expanded (PC)</option>"
-            + "<option value='french'>French Format</option>"
-            + "<option disabled>----------</option>"
-            + "<option value='0'>00 - Promo</option>"
-            + "<option value='1'>01 - The Fellowship of the Ring</option>"
-            + "<option value='51'>01E - The Fellowship of the Ring (PC Errata)</option>"
-            + "<option value='2'>02 - Mines of Moria</option>"
-            + "<option value='52'>02E - Mines of Moria (PC Errata)</option>"
-            + "<option value='3'>03 - Realms of the Elf-lords</option>"
-            + "<option value='53'>03E - Realms of the Elf-lords (PC Errata)</option>"
-            + "<option value='4'>04 - The Two Towers</option>"
-            + "<option value='54'>04E - The Two Towers (PC Errata)</option>"
-            + "<option value='5'>05 - Battle of Helm's Deep</option>"
-            + "<option value='6'>06 - Ents of Fangorn</option>"
-            + "<option value='7'>07 - The Return of the King</option>"
-            + "<option value='57'>07E - The Return of the King (PC Errata)</option>"
-            + "<option value='8'>08 - Siege of Gondor</option>"
-            + "<option value='58'>08E - Siege of Gondor (PC Errata)</option>"
-            + "<option value='9'>09 - Reflections</option>"
-            + "<option value='59'>09E - Reflections (PC Errata)</option>"
-            + "<option value='10'>10 - Mount Doom</option>"
-            + "<option value='60'>10E - Mount Doom (PC Errata)</option>"
-            + "<option value='11'>11 - Shadows</option>"
-            + "<option value='61'>11E - Shadows (PC Errata)</option>"
-            + "<option value='12'>12 - Black Rider</option>"
-            + "<option value='13'>13 - Bloodlines</option>"
-            + "<option value='63'>13E - Bloodlines (PC Errata)</option>"
-            + "<option value='14'>14 - Expanded Middle-earth</option>"
-            + "<option value='15'>15 - The Hunters</option>"
-            + "<option value='65'>15E - The Hunters (PC Errata)</option>"
-            + "<option value='16'>16 - The Wraith Collection</option>"
-            + "<option value='17'>17 - Rise of Saruman</option>"
-            + "<option value='18'>18 - Treachery & Deceit</option>"
-            + "<option value='19'>19 - Ages End</option>"
-            + "<option value='69'>19E - Ages End (PC Errata)</option>"
-            + "<option value='101,151'>V1 - Shadow of the Past (PC)</option>"
-            + "<option value='30'>30 - The Hobbit: Main Deck</option>"
-            + "<option value='31'>31 - The Hobbit: Expansion 1</option>"
-            + "<option value='32'>32 - The Hobbit: Expansion 2</option>"
-            + "<option value='33'>33 - The Hobbit: Expansion 3</option>"
-            + "<option disabled>----------</option>"
-            + "<option value='70-89,150-200'>All Player's Council Playtest Cards</option>"
-            //+ "<option value='151'>PLAYTEST - Shadow of the Past (PC)</option>"
-            + "<option value='test_pc_fotr_block'>PLAYTEST - Fellowship Block (PC)</option>"
-            + "<option value='test_pc_movie'>PLAYTEST - Movie Block (PC)</option>"
-            + "<option value='test_pc_expanded'>PLAYTEST - Expanded (PC)</option>"
-            
-            + "</select>");
+		filterTable.append(genFilterTR(this.keywordLabel, this.keywordSelect, this.phaseLabel, this.phaseSelect));
+		filterTable.append(genFilterTR(this.raceLabel, this.raceSelect, this.itemClassLabel, this.itemClassSelect));
+		
+		filterTable.append("<tr>" + genFilterTD(this.twilightLabel)
+								  + genFilterTDPair(this.twilightCompareSelect, this.twilightValueInput)
+								  + genFilterTD(this.siteNumberLabel)
+								  + genFilterTDPair(this.siteNumberCompareSelect, this.siteNumberValueInput)
+								  + "</tr>");
+		
+		filterTable.append("<tr>" + genFilterTD(this.strengthLabel)
+								  + genFilterTDPair(this.strengthCompareSelect, this.strengthValueInput)
+								  + genFilterTD(this.signetLabel)
+								  + genFilterTD(this.signetSelect)
+								  + "</tr>");
+		
+		filterTable.append("<tr>" + genFilterTD(this.vitalityLabel)
+								  + genFilterTDPair(this.vitalityCompareSelect, this.vitalityValueInput)
+								  + genFilterTD(this.resistanceLabel)
+								  + genFilterTDPair(this.resistanceCompareSelect, this.resistanceValueInput)
+								  + "</tr>");
 
-        this.cardTypeLabel = $("<label for='cardTypeSelect' class='filterLabel'>Card&nbsp;Type:</label>");
-        this.cardTypeSelect = $("<select id='cardTypeSelect' class='filterInput'>"
-            + "<option value='' selected='selected'>Any</option>"
-            + "<option value='COMPANION,ALLY,MINION'>Characters</option>"
-            + "<option value='POSSESSION,ARTIFACT'>Items</option>"
-            + "<option value='SITE'>Sites</option>"
-            + "<option value='ALLY'>Allies</option>"
-            + "<option value='ARTIFACT'>Artifacts</option>"
-            + "<option value='COMPANION'>Companions</option>"
-            + "<option value='CONDITION'>Conditions</option>"
-            + "<option value='EVENT'>Events</option>"
-            + "<option value='FOLLOWER'>Followers</option>"
-            + "<option value='MINION'>Minions</option>"
-            + "<option value='POSSESSION'>Possessions</option>"
-            + "</select>");
-        
-        this.keywordLabel = $("<label for='keywordSelect' class='filterLabel'>Keyword:</label>");
-        this.keywordSelect = $("<select id='keywordSelect' class='filterInput'>"
-            + "<option value='' selected='selected'>Any</option>"
-            + "<option value='ARCHER'>Archer</option>"
-            + "<option value='BATTLEGROUND'>Battleground</option>"
-            + "<option value='BESIEGER'>Besieger</option>"
-            + "<option value='CORSAIR'>Corsair</option>"
-            + "<option value='DWELLING'>Dwelling</option>"
-            + "<option value='EASTERLING'>Easterling</option>"
-            + "<option value='ENDURING'>Enduring</option>"
-            + "<option value='ENGINE'>Engine</option>"
-            + "<option value='FIERCE'>Fierce</option>"
-            + "<option value='FOREST'>Forest</option>"
-            + "<option value='FORTIFICATION'>Fortification</option>"
-            + "<option value='HUNTER'>Hunter</option>"
-            + "<option value='KNIGHT'>Knight</option>"
-            + "<option value='LURKER'>Lurker</option>"
-            + "<option value='MACHINE'>Machine</option>"
-            + "<option value='MARSH'>Marsh</option>"
-            + "<option value='MOUNTAIN'>Mountain</option>"
-            + "<option value='MUSTER'>Muster</option>"
-            + "<option value='PIPEWEED'>Pipeweed</option>"
-            + "<option value='PLAINS'>Plains</option>"
-            + "<option value='RANGER'>Ranger</option>"
-            + "<option value='RING_BOUND'>Ring-bound</option>"
-            + "<option value='RIVER'>River</option>"
-            + "<option value='SEARCH'>Search</option>"
-            + "<option value='SOUTHRON'>Southron</option>"
-            + "<option value='SPELL'>Spell</option>"
-            + "<option value='STEALTH'>Stealth</option>"
-            + "<option value='TALE'>Tale</option>"
-            + "<option value='TENTACLE'>Tentacle</option>"
-            + "<option value='TRACKER'>Tracker</option>"
-            + "<option value='TWILIGHT'>Twilight</option>"
-            + "<option value='UNDERGROUND'>Underground</option>"
-            + "<option value='UNHASTY'>Unhasty</option>"
-            + "<option value='VALIANT'>Valiant</option>"
-            + "<option value='VILLAGER'>Villager</option>"
-            + "<option value='WARG_RIDER'>Warg-rider</option>"
-            + "<option value='WEATHER'>Weather</option>"
-            //Additional Hobbit Draft keyword
-            + "<option value='WISE'>Wise</option>"
-            + "</select>");
-        
-        this.raceLabel = $("<label for='raceSelect' class='filterLabel'>Race:</label>");
-        this.raceSelect = $("<select id='raceSelect' class='filterInput'>"
-            + "<option value='' selected='selected'>Any</option>"
-            + "<option value='BALROG'>Balrog</option>"
-            + "<option value='CREATURE'>Creature</option>"
-            + "<option value='CROW'>Crow</option>"
-            + "<option value='DRAGON'>Dragon</option>"
-            + "<option value='DWARF'>Dwarf</option>"
-            + "<option value='EAGLE'>Eagle</option>"
-            + "<option value='ELF'>Elf</option>"
-            + "<option value='ENT'>Ent</option>"
-            + "<option value='GIANT'>Giant</option>"
-            + "<option value='HALF_TROLL'>Half-troll</option>"
-            + "<option value='HOBBIT'>Hobbit</option>"
-            + "<option value='MAIA'>Maia</option>"
-            + "<option value='MAN'>Man</option>"
-            + "<option value='NAZGUL'>Nazgul</option>"
-            + "<option value='ORC'>Orc</option>"
-            + "<option value='SPIDER'>Spider</option>"
-            + "<option value='TREE'>Tree</option>"
-            + "<option value='TROLL'>Troll</option>"
-            + "<option value='URUK_HAI'>Uruk-hai</option>"
-            + "<option value='WARG'>Warg</option>"
-            + "<option value='WIZARD'>Wizard</option>"
-            + "<option value='WRAITH'>Wraith</option>"
-            + "</select>");
-        
-        this.itemClassLabel = $("<label for='itemClassSelect' class='filterLabel'>Item Class:</label>");
-        this.itemClassSelect = $("<select id='itemClassSelect' class='filterInput'>"
-            + "<option value='' selected='selected'>Any</option>"
-            + "<option value='ARMOR'>Armor</option>"
-            + "<option value='BOX'>Box</option>"
-            + "<option value='BRACERS'>Bracers</option>"
-            + "<option value='BROOCH'>Brooch</option>"
-            + "<option value='CLOAK'>Cloak</option>"
-            + "<option value='GAUNTLETS'>Gauntlets</option>"
-            + "<option value='HAND_WEAPON'>Hand Weapon</option>"
-            + "<option value='HELM'>Helm</option>"
-            + "<option value='HORN'>Horn</option>"
-            + "<option value='MOUNT'>Mount</option>"
-            + "<option value='PALANTIR'>Palantir</option>"
-            + "<option value='PHIAL'>Phial</option>"
-            + "<option value='PIPE'>Pipe</option>"
-            + "<option value='PONY'>Pony</option>"
-            + "<option value='RANGED_WEAPON'>Ranged Weapon</option>"
-            + "<option value='RING'>Ring</option>"
-            + "<option value='SHIELD'>Shield</option>"
-            + "<option value='STAFF'>Staff</option>"
-            + "<option value='CLASSLESS'>Classless</option>"
-            + "</select>");
-        
-        
-        this.phaseLabel = $("<label for='phaseSelect' class='filterLabel'>Phase:</label>");
-        this.phaseSelect = $("<select id='phaseSelect' class='filterInput'>"
-            + "<option value='' selected='selected'>Any</option>"
-            + "<option value='FELLOWSHIP'>Fellowship</option>"
-            + "<option value='SHADOW'>Shadow</option>"
-            + "<option value='MANEUVER'>Maneuver</option>"
-            + "<option value='ARCHERY'>Archery</option>"
-            + "<option value='ASSIGNMENT'>Assignment</option>"
-            + "<option value='SKIRMISH'>Skirmish</option>"
-            + "<option value='REGROUP'>Regroup</option>"
-            + "<option value='RESPONSE'>Response</option>"
-            + "</select>");
-       
-
-        this.nameLabel = $("<label for='nameInput' class='filterLabel'>Name&nbsp;contains:</label>");
-        this.nameInput = $("<input id='nameInput' type='text' maxlength='100' class='filterInput' style='width: 250px;'>");
-        
-        this.gametextLabel = $("<label for='gametextInput' class='filterLabel'>Game Text&nbsp;contains:</label>");
-        this.gametextInput = $("<input id='gametextInput' type='text' maxlength='100' class='filterInput' style='width: 250px;'>");
-        
-        this.generateNumericComparator("twilight", "Twilight");
-        this.generateNumericComparator("strength", "Strength");
-        this.generateNumericComparator("vitality", "Vitality");
-        this.generateNumericComparator("siteNumber", "Site Number");
-        this.generateNumericComparator("resistance", "Resistance");
-        
-        this.signetLabel = $("<label for='signetSelect' class='filterLabel'>Signet:</label>");
-        this.signetSelect = $("<select id='signetSelect' class='filterInput'>"
-            + "<option value='' selected='selected'>Any</option>"
-            + "<option value='ARAGORN'>Aragorn</option>"
-            + "<option value='FRODO'>Frodo</option>"
-            + "<option value='GANDALF'>Gandalf</option>"
-            + "<option value='THEODEN'>Theoden</option>"
-            + "</select>");
-        
-        this.productLabel = $("<label for='productSelect' class='filterLabel'>Product:</label>");
-        this.productSelect = $("<select id='productSelect' class='filterInput'>"
-            + "<option value='' selected='selected'>Any</option>"
-            + "<option value='pack'>Packs</option>"
-            + "<option value='card'>Cards</option>"
-            + "<option value='foil'>Foils</option>"
-            + "<option value='nonFoil'>Non-foils</option>"
-            + "<option value='tengwar'>Tengwar</option>"
-            + "</select>");
-        
-        this.sortLabel = $("<label for='sortSelect' class='filterLabel'>Sort by:</label>");
-        this.sortSelect = $("<select id='sortSelect' class='filterInput'>"
-            + "<option value='name' selected='selected'>Name</option>"
-            + "<option value='twilight,name'>Twilight</option>"
-            + "<option value='siteNumber,name'>Site Number</option>"
-            + "<option value='strength,name'>Strength</option>"
-            + "<option value='vitality,name'>Vitality</option>"
-            + "<option value='cardType,name'>Card Type</option>"
-            + "<option value='culture,name'>Culture</option>"
-            + "</select>");
-        
-        this.rarityLabel = $("<label for='raritySelect' class='filterLabel'>Rarity:</label>");
-        this.raritySelect = $("<select id='raritySelect' class='filterInput'>"
-            + "<option value='' selected='selected'>Any</option>"
-            + "<option value='R'>Rare</option>"
-            + "<option value='U'>Uncommon</option>"
-            + "<option value='C'>Common</option>"
-            + "<option value='A'>Alternate Image</option>"
-            + "<option value='P'>Promo</option>"
-            + "<option value='X'>Rare+</option>"
-            + "<option value='S'>Fixed</option>"
-            + "<option value='C,U,P,S'>Poorman's</option>"
-            + "</select>");
-        
-        this.resetAdvancedFiltersButton = $("<button id='resetAdvancedFiltersButton' class='ui-button-icon-primary'>Reset advanced filters only</button>").button();
-        this.resetAllFiltersButton = $("<button id='resetAllFiltersButton' class='ui-button-icon-primary'>Reset all filters</button>").button();
-        
-        var genFilterTD = function(element, params) {
-            if(params !== undefined) 
-                return '<td ' + params + '>' + element[0].outerHTML + '</td>';
-            return '<td>' + element[0].outerHTML + '</td>';
-        };
-        
-        var genFilterTDPair = function(...elements) {
-            let cell = '<td>';
-            elements.forEach(function(item) {
-               cell += item[0].outerHTML; 
-            });
-            return cell + "</td>"
-        };
-        
-        var genFilterTR = function(...elements) {
-            let row = '<tr>';
-            elements.forEach(function(item) {
-               row += genFilterTD(item); 
-            });
-            return row + "</tr>"
-        };
-        
-        var genFilterTRPair = function(label, field) {
-            let row = '<tr>';
-            row += genFilterTD(label);
-            row += genFilterTD(field, "colspan='3'");
-            return row + "</tr>"
-        };
-        
-        var genFilterTRSolo = function(message, wrapperClass) {
-            return '<tr><td colspan="4"><div class="' + wrapperClass + '">' + message + '</div></td></tr>'
-        };
-        
-        var filterTable = $("<table id='filterTable' />");
-        filterTable.append(genFilterTR(this.productLabel, this.productSelect, this.rarityLabel, this.raritySelect));
-        filterTable.append(genFilterTR(this.sideLabel, this.sideSelect, this.sortLabel, this.sortSelect));
-        filterTable.append(genFilterTRPair(this.setLabel, this.setSelect));
-        filterTable.append(genFilterTRPair(this.cardTypeLabel, this.cardTypeSelect));
-        filterTable.append(genFilterTRSolo("Advanced filters (<a target='_blank' href='https://wiki.lotrtcgpc.net/wiki/Special:RunQuery/CardSearch'>See more on the Wiki.</a>)", "cardFilterText"));
-        filterTable.append(genFilterTRPair(this.nameLabel, this.nameInput));
-        filterTable.append(genFilterTRPair(this.gametextLabel, this.gametextInput));
-
-        filterTable.append(genFilterTR(this.keywordLabel, this.keywordSelect, this.phaseLabel, this.phaseSelect));
-        filterTable.append(genFilterTR(this.raceLabel, this.raceSelect, this.itemClassLabel, this.itemClassSelect));
-        
-        filterTable.append("<tr>" + genFilterTD(this.twilightLabel)
-                                  + genFilterTDPair(this.twilightCompareSelect, this.twilightValueInput)
-                                  + genFilterTD(this.siteNumberLabel)
-                                  + genFilterTDPair(this.siteNumberCompareSelect, this.siteNumberValueInput)
-                                  + "</tr>");
-        
-        filterTable.append("<tr>" + genFilterTD(this.strengthLabel)
-                                  + genFilterTDPair(this.strengthCompareSelect, this.strengthValueInput)
-                                  + genFilterTD(this.signetLabel)
-                                  + genFilterTD(this.signetSelect)
-                                  + "</tr>");
-        
-        filterTable.append("<tr>" + genFilterTD(this.vitalityLabel)
-                                  + genFilterTDPair(this.vitalityCompareSelect, this.vitalityValueInput)
-                                  + genFilterTD(this.resistanceLabel)
-                                  + genFilterTDPair(this.resistanceCompareSelect, this.resistanceValueInput)
-                                  + "</tr>");
-
-        filterTable.append(genFilterTRSolo(this.resetAdvancedFiltersButton[0].outerHTML + this.resetAllFiltersButton[0].outerHTML, "cardFilterText flex-horiz"));
+		filterTable.append(genFilterTRSolo(this.resetAdvancedFiltersButton[0].outerHTML + this.resetAllFiltersButton[0].outerHTML, "cardFilterText flex-horiz"));
 
 
-        this.fullFilterDiv.append(filterTable);
-        this.pageDiv.append(this.fullFilterDiv);
+		this.fullFilterDiv.append(filterTable);
+		this.pageDiv.append(this.fullFilterDiv);
 
-        this.filterDiv = $("<div id='culture-buttons'></div>");
+		this.filterDiv = $("<div id='culture-buttons'></div>");
 
-        this.filterDiv.append("<div id='culture1'>"
-            + "<input type='checkbox' id='DWARVEN'/><label for='DWARVEN' id='labelDWARVEN' class='culture'><img src='images/cultures/dwarven.svg'/></label>"
-            + "<input type='checkbox' id='ELVEN'/><label for='ELVEN' id='labelELVEN' class='culture'><img src='images/cultures/elven.svg'/></label>"
-            + "<input type='checkbox' id='GANDALF'/><label for='GANDALF' id='labelGANDALF' class='culture'><img src='images/cultures/gandalf.svg'/></label>"
-            + "<input type='checkbox' id='GONDOR'/><label for='GONDOR' id='labelGONDOR' class='culture'><img src='images/cultures/gondor.svg'/></label>"
-            + "<input type='checkbox' id='ROHAN'/><label for='ROHAN' id='labelROHAN' class='culture'><img src='images/cultures/rohan.svg'/></label>"
-            + "<input type='checkbox' id='SHIRE'/><label for='SHIRE' id='labelSHIRE' class='culture'><img src='images/cultures/shire.svg'/></label>"
-            + "<input type='checkbox' id='GOLLUM'/><label for='GOLLUM' id='labelGOLLUM' class='culture'><img src='images/cultures/gollum.svg'/></label>"
-            + "<input type='checkbox' id='DUNLAND'/><label for='DUNLAND' id='labelDUNLAND' class='culture'><img src='images/cultures/dunland.svg'/></label>"
-            + "<input type='checkbox' id='ISENGARD'/><label for='ISENGARD' id='labelISENGARD' class='culture'><img src='images/cultures/isengard.svg'/></label>"
-            + "<input type='checkbox' id='MEN'/><label for='MEN' id='labelMEN' class='culture'><img src='images/cultures/men.svg'/></label>"
-            + "<input type='checkbox' id='MORIA'/><label for='MORIA' id='labelMORIA' class='culture'><img src='images/cultures/moria.svg'/></label>"
-            + "<input type='checkbox' id='ORC'/><label for='ORC' id='labelORC' class='culture'><img src='images/cultures/orc.svg'/></label>"
-            + "<input type='checkbox' id='RAIDER'/><label for='RAIDER' id='labelRAIDER' class='culture'><img src='images/cultures/raider.svg'/></label>"
-            + "<input type='checkbox' id='SAURON'/><label for='SAURON' id='labelSAURON' class='culture'><img src='images/cultures/sauron.svg'/></label>"
-            + "<input type='checkbox' id='URUK_HAI'/><label for='URUK_HAI' id='labelURUK_HAI' class='culture'><img src='images/cultures/uruk.svg'/></label>"
-            + "<input type='checkbox' id='WRAITH'/><label for='WRAITH' id='labelWRAITH' class='culture'><img src='images/cultures/ringwraith.svg'/></label>"
-        );
-        //Additional Hobbit Draft cultures
-        //var hobbitFilterDiv = $("<div id='culture2' style='display:flex;flex-wrap:wrap;'></div>");
-        this.filterDiv.append("<div id='culture2'>"
-            + "<input type='checkbox' id='ESGAROTH'/><label for='ESGAROTH' id='labelESGAROTH' ><img src='images/cultures/esgaroth.png'/></label>"
-            + "<input type='checkbox' id='GUNDABAD'/><label for='GUNDABAD' id='labelGUNDABAD' ><img src='images/cultures/gundabad.png'/></label>"
-            + "<input type='checkbox' id='MIRKWOOD'/><label for='MIRKWOOD' id='labelMIRKWOOD' ><img src='images/cultures/mirkwood.png'/></label>"
-            + "<input type='checkbox' id='SMAUG'/><label for='SMAUG' id='labelSMAUG' ><img src='images/cultures/smaug.png'/></label>"
-            + "<input type='checkbox' id='SPIDER'/><label for='SPIDER' id='labelSPIDER' ><img src='images/cultures/spider.png'/></label>"
-            + "<input type='checkbox' id='TROLL'/><label for='TROLL' id='labelTROLL' ><img src='images/cultures/troll.png'/></label>"
-        );
+		this.filterDiv.append("<div id='culture1'>"
+			+ "<input type='checkbox' id='DWARVEN'/><label for='DWARVEN' id='labelDWARVEN' class='culture'><img src='images/cultures/dwarven.svg'/></label>"
+			+ "<input type='checkbox' id='ELVEN'/><label for='ELVEN' id='labelELVEN' class='culture'><img src='images/cultures/elven.svg'/></label>"
+			+ "<input type='checkbox' id='GANDALF'/><label for='GANDALF' id='labelGANDALF' class='culture'><img src='images/cultures/gandalf.svg'/></label>"
+			+ "<input type='checkbox' id='GONDOR'/><label for='GONDOR' id='labelGONDOR' class='culture'><img src='images/cultures/gondor.svg'/></label>"
+			+ "<input type='checkbox' id='ROHAN'/><label for='ROHAN' id='labelROHAN' class='culture'><img src='images/cultures/rohan.svg'/></label>"
+			+ "<input type='checkbox' id='SHIRE'/><label for='SHIRE' id='labelSHIRE' class='culture'><img src='images/cultures/shire.svg'/></label>"
+			+ "<input type='checkbox' id='GOLLUM'/><label for='GOLLUM' id='labelGOLLUM' class='culture'><img src='images/cultures/gollum.svg'/></label>"
+			+ "<input type='checkbox' id='DUNLAND'/><label for='DUNLAND' id='labelDUNLAND' class='culture'><img src='images/cultures/dunland.svg'/></label>"
+			+ "<input type='checkbox' id='ISENGARD'/><label for='ISENGARD' id='labelISENGARD' class='culture'><img src='images/cultures/isengard.svg'/></label>"
+			+ "<input type='checkbox' id='MEN'/><label for='MEN' id='labelMEN' class='culture'><img src='images/cultures/men.svg'/></label>"
+			+ "<input type='checkbox' id='MORIA'/><label for='MORIA' id='labelMORIA' class='culture'><img src='images/cultures/moria.svg'/></label>"
+			+ "<input type='checkbox' id='ORC'/><label for='ORC' id='labelORC' class='culture'><img src='images/cultures/orc.svg'/></label>"
+			+ "<input type='checkbox' id='RAIDER'/><label for='RAIDER' id='labelRAIDER' class='culture'><img src='images/cultures/raider.svg'/></label>"
+			+ "<input type='checkbox' id='SAURON'/><label for='SAURON' id='labelSAURON' class='culture'><img src='images/cultures/sauron.svg'/></label>"
+			+ "<input type='checkbox' id='URUK_HAI'/><label for='URUK_HAI' id='labelURUK_HAI' class='culture'><img src='images/cultures/uruk.svg'/></label>"
+			+ "<input type='checkbox' id='WRAITH'/><label for='WRAITH' id='labelWRAITH' class='culture'><img src='images/cultures/ringwraith.svg'/></label>"
+		);
+		//Additional Hobbit Draft cultures
+		//var hobbitFilterDiv = $("<div id='culture2' style='display:flex;flex-wrap:wrap;'></div>");
+		this.filterDiv.append("<div id='culture2'>"
+			+ "<input type='checkbox' id='ESGAROTH'/><label for='ESGAROTH' id='labelESGAROTH' ><img src='images/cultures/esgaroth.png'/></label>"
+			+ "<input type='checkbox' id='GUNDABAD'/><label for='GUNDABAD' id='labelGUNDABAD' ><img src='images/cultures/gundabad.png'/></label>"
+			+ "<input type='checkbox' id='MIRKWOOD'/><label for='MIRKWOOD' id='labelMIRKWOOD' ><img src='images/cultures/mirkwood.png'/></label>"
+			+ "<input type='checkbox' id='SMAUG'/><label for='SMAUG' id='labelSMAUG' ><img src='images/cultures/smaug.png'/></label>"
+			+ "<input type='checkbox' id='SPIDER'/><label for='SPIDER' id='labelSPIDER' ><img src='images/cultures/spider.png'/></label>"
+			+ "<input type='checkbox' id='TROLL'/><label for='TROLL' id='labelTROLL' ><img src='images/cultures/troll.png'/></label>"
+		);
 
-        this.pageDiv.append(this.filterDiv);
-        
+		this.pageDiv.append(this.filterDiv);
+		
 
-        $("#culture-buttons").buttonset();
-        
-        var setFilterChanged = function () {
-            var setSelected = $("#setSelect option:selected").prop("value");
-            if (setSelected.includes("30") || setSelected.includes("31")
-                    || setSelected.includes("32") || setSelected.includes("33")) {
-                $("#culture2").show();
-            } else {
-                $("#labelESGAROTH").removeClass("ui-state-active");
-                $("#labelGUNDABAD").removeClass("ui-state-active");
-                $("#labelMIRKWOOD").removeClass("ui-state-active");
-                $("#labelSMAUG").removeClass("ui-state-active");
-                $("#labelSPIDER").removeClass("ui-state-active");
-                $("#labelTROLL").removeClass("ui-state-active");
-                $("#culture2").hide();
-            }
-            return fullFilterChanged();
-        };
+		$("#culture-buttons").buttonset();
 
-        var fullFilterChanged = function () {
-            
-            that.filter = that.calculateDeckFilter()
-            
-            if(!that.pauseUpdates) {
-                that.start = 0;
-                that.getCollection();
-            }
-            
-            return true;
-        };
+		//Hide Hobbit cultures by default
+		$("#culture2").hide();
 
-        //Hide Hobbit cultures by default
-        $("#culture2").hide();
+		this.setSelect.change(() => this.setFilterChanged(that));
+		this.nameInput.change(this.fullFilterChanged);
+		this.gametextInput.change(this.fullFilterChanged);
+		this.sortSelect.change(this.fullFilterChanged);
+		this.raritySelect.change(this.fullFilterChanged);
 
-        this.setSelect.change(setFilterChanged);
-        this.nameInput.change(fullFilterChanged);
-        this.gametextInput.change(fullFilterChanged);
-        this.sortSelect.change(fullFilterChanged);
-        this.raritySelect.change(fullFilterChanged);
-        
-        
-        // Callback function for when the product filter is changed
-        var productChanged = function () {
-            var isPack = ($("#productSelect option:selected").prop("value") == "pack");
+		// Hide initially hidden fields
+		$("#twilightValueInput").prop("hidden", true);
+		$("#strengthValueInput").prop("hidden", true);
+		$("#vitalityValueInput").prop("hidden", true);
+		$("#siteNumberValueInput").prop("hidden", true);
+		$("#resistanceValueInput").prop("hidden", true);
+		
 
-            $("#sideSelect").prop("disabled", isPack);
-            $("#setSelect").prop("disabled", isPack);
-            $("#cardTypeSelect").prop("disabled", isPack);
-            $("#raritySelect").prop("disabled", isPack);
-            $("#sortSelect").prop("disabled", isPack);
-            
-            $("#gametextInput").prop("disabled", isPack);
-            $("#keywordSelect").prop("disabled", isPack);
-            $("#raceSelect").prop("disabled", isPack);
-            $("#itemClassSelect").prop("disabled", isPack);
-            $("#phaseSelect").prop("disabled", isPack);
-            
-            $("#twilightCompareSelect").prop("disabled", isPack);
-            $("#twilightValueInput").prop("hidden", isPack);
-            $("#strengthCompareSelect").prop("disabled", isPack);
-            $("#strengthValueInput").prop("hidden", isPack);
-            $("#vitalityCompareSelect").prop("disabled", isPack);
-            $("#vitalityValueInput").prop("hidden", isPack);
-            $("#signetSelect").prop("disabled", isPack);
-            $("#siteNumberCompareSelect").prop("disabled", isPack);
-            $("#siteNumberValueInput").prop("hidden", isPack);
-            $("#resistanceCompareSelect").prop("disabled", isPack);
-            $("#resistanceValueInput").prop("hidden", isPack);
+		// Reset buttons
+		$("#resetAdvancedFiltersButton").click(
+				function (event) {
+					that.pauseUpdates = true;
+					$("#nameInput, #gametextInput" +
+					  ", #keywordSelect, #raceSelect, #itemClassSelect, #phaseSelect, " +
+					  ", #twilightCompareSelect, #twilightValueInput" +
+					  ", #strengthCompareSelect, #strengthValueInput" +
+					  ", #vitalityCompareSelect, #vitalityValueInput" + 
+					  ", #signetSelect" +
+					  ", #siteNumberCompareSelect, #siteNumberValueInput" +
+					  ", #resistanceCompareSelect, #resistanceValueInput").val('').trigger('change');
+					that.pauseUpdates = false;
+					that.fullFilterChanged();
+					
+					// $("#labelDWARVEN, #labelELVEN, #labelGANDALF, #labelGONDOR, #labelROHAN, #labelSHIRE" +
+					//   ", #labelGOLLUM, #labelDUNLAND, #labelISENGARD, #labelMORIA, #labelRAIDER, #labelSAURON" +
+					//   ", #labelMEN, #labelORC, #labelURUK_HAI, #labelWRAITH" +
+					//   ", #labelESGAROTH, #labelGUNDABAD, #labelMIRKWOOD, #labelSMAUG, #labelSPIDER, #labelTROLL").removeClass("ui-state-active");
+				});
+		$("#resetAllFiltersButton").click(
+				function (event) {
+					that.pauseUpdates = true;
+					$("#productSelect, #raritySelect, #blockSelect, #sideSelect, #sortSelect, #setSelect, #cardTypeSelect" +
+					  ", #nameInput, #gametextInput" +
+					  ", #keywordSelect, #raceSelect, #itemClassSelect, #phaseSelect, " +
+					  ", #twilightCompareSelect, #twilightValueInput" +
+					  ", #strengthCompareSelect, #strengthValueInput" +
+					  ", #vitalityCompareSelect, #vitalityValueInput" + 
+					  ", #signetSelect" +
+					  ", #siteNumberCompareSelect, #siteNumberValueInput" +
+					  ", #resistanceCompareSelect, #resistanceValueInput").val('').trigger('change');
+					
+					$("#DWARVEN, #ELVEN, #GANDALF, #GONDOR, #ROHAN, #SHIRE" +
+					  ", #GOLLUM, #DUNLAND, #ISENGARD, #MORIA, #RAIDER, #SAURON" +
+					  ", #MEN, #ORC, #URUK_HAI, #WRAITH" +
+					  ", #ESGAROTH, #GUNDABAD, #MIRKWOOD, #SMAUG, #SPIDER, #TROLL").prop("checked", false).change();
+					that.pauseUpdates = false;
+					that.fullFilterChanged();
+				});
 
-            return compareTypeChanged();
-        };
-        
-        var resetFields = function(name) {
-            if ($("#" + name + "CompareSelect option:selected").prop("value") == "") {
-                $("#" + name + "ValueInput").prop("hidden", true);
-                $("#" + name + "ValueInput").prop("value", '');
-            }
-            else {
-                $("#" + name + "ValueInput").prop("hidden", false);
-            }
-        };
+		// Triggers for filter fields changed
+		$("#productSelect").change(() => this.productChanged(that));
+		
+		$("#blockSelect, #sideSelect, #setSelect, #cardTypeSelect, #raritySelect, #sortSelect, #nameInput, #gametextInput" +
+		  ", #keywordSelect, #raceSelect, #itemClassSelect, #phaseSelect, " +
+		  ", #twilightValueInput, #strengthValueInput, #vitalityValueInput, #signetSelect" +
+		  ", #siteNumberValueInput, #resistanceValueInput").change(() => this.setFilterChanged(that));
 
-        // Callback function for when a filter compare is changed, to switch
-        // all of the numeric comparison dropdowns to a default state
-        var compareTypeChanged = function () {
-            resetFields("twilight");
-            resetFields("strength");
-            resetFields("vitality");
-            resetFields("siteNumber");
-            resetFields("resistance");
-            return filterChanged();
-        };
+		$("#twilightCompareSelect, #strengthCompareSelect, #vitalityCompareSelect" +
+		  ", #siteNumberCompareSelect, #resistanceCompareSelect").change(() => this.compareTypeChanged(that));
+		
+		$("#DWARVEN, #ELVEN, #GANDALF, #GONDOR, #ROHAN, #SHIRE" +
+					  ", #GOLLUM, #DUNLAND, #ISENGARD, #MORIA, #RAIDER, #SAURON" +
+					  ", #MEN, #ORC, #URUK_HAI, #WRAITH" +
+					  ", #ESGAROTH, #GUNDABAD, #MIRKWOOD, #SMAUG, #SPIDER, #TROLL").change(() => this.setFilterChanged(that));
+		
+		// $("#labelDWARVEN, #labelELVEN, #labelGANDALF, #labelGONDOR, #labelROHAN, #labelSHIRE" +
+		//               ", #labelGOLLUM, #labelDUNLAND, #labelISENGARD, #labelMORIA, #labelRAIDER, #labelSAURON" +
+		//               ", #labelMEN, #labelORC, #labelURUK_HAI, #labelWRAITH" +
+		//               ", #labelESGAROTH, #labelGUNDABAD, #labelMIRKWOOD, #labelSMAUG, #labelSPIDER, #labelTROLL").click(setFilterChanged);
+		
+		this.collectionDiv = $("<div id='collection-display' style='display:flex;flex-direction:column;position:relative;'></div>");
+		//collection-display
+		pageElem.append(this.collectionDiv);
+	},
+	
+	generateNumericComparator: function(id, labelText) {
+		this[id + "Label"] = $("<label for='" + id + "CompareSelect' class='filterLabel'>" + labelText + ":</label>");
+		this[id + "CompareSelect"] = $("<select id='" + id + "CompareSelect' class='filterInput'>"
+			+ "<option value='' selected='selected'>Any</option>"
+			+ "<option value='EQUALS'>=</option>"
+			+ "<option value='GREATER_THAN'>></option>"
+			+ "<option value='GREATER_THAN_OR_EQUAL_TO'>>=</option>"
+			+ "<option value='LESS_THAN'><</option>"
+			+ "<option value='LESS_THAN_OR_EQUAL_TO'><=</option>"
+			+ "</select>");
+		this[id + "ValueInput"] = $("<input id='" + id + "ValueInput' type='number' min = '0' max='12' class='filterInput' style='width: 35px;'>");
+	},
+	
+	setFilterChanged: function(that) {
+		if (that.blocks.find((x) => x.filter == "hobbit")) {
+			$("#culture2").show();
+		} else {
+			$("#labelESGAROTH").removeClass("ui-state-active");
+			$("#labelGUNDABAD").removeClass("ui-state-active");
+			$("#labelMIRKWOOD").removeClass("ui-state-active");
+			$("#labelSMAUG").removeClass("ui-state-active");
+			$("#labelSPIDER").removeClass("ui-state-active");
+			$("#labelTROLL").removeClass("ui-state-active");
+			$("#culture2").hide();
+		}
+		return that.fullFilterChanged();
+	},
 
-        // Callback function for when a filter is changed
-        var filterChanged = function () {
-            var newFilterString = that.calculateDeckFilter();
-            // Only re-gather collection if filter actually changed from previous filter
-            if (that.filter != newFilterString) {
-                that.filter = newFilterString
-                that.start = 0;
-                that.getCollection();
-            }
-            return true;
-        };
+	fullFilterChanged: function() {
+		
+		if(this.initialStartup && !this.pauseUpdates) {
+			this.filter = this.calculateDeckFilter()
+			this.start = 0;
+			this.getCollection();
+		}
+		
+		return true;
+	},
+	
+	// Callback function for when the product filter is changed
+	productChanged: function(that) {
+		var isPack = ($("#productSelect option:selected").prop("value") == "pack");
 
-        // Hide initially hidden fields
-        $("#twilightValueInput").prop("hidden", true);
-        $("#strengthValueInput").prop("hidden", true);
-        $("#vitalityValueInput").prop("hidden", true);
-        $("#siteNumberValueInput").prop("hidden", true);
-        $("#resistanceValueInput").prop("hidden", true);
-        
+		$("#blockSelect").prop("disabled", isPack);
+		$("#sideSelect").prop("disabled", isPack);
+		$("#setSelect").prop("disabled", isPack);
+		$("#cardTypeSelect").prop("disabled", isPack);
+		$("#raritySelect").prop("disabled", isPack);
+		$("#sortSelect").prop("disabled", isPack);
+		
+		$("#gametextInput").prop("disabled", isPack);
+		$("#keywordSelect").prop("disabled", isPack);
+		$("#raceSelect").prop("disabled", isPack);
+		$("#itemClassSelect").prop("disabled", isPack);
+		$("#phaseSelect").prop("disabled", isPack);
+		
+		$("#twilightCompareSelect").prop("disabled", isPack);
+		$("#twilightValueInput").prop("hidden", isPack);
+		$("#strengthCompareSelect").prop("disabled", isPack);
+		$("#strengthValueInput").prop("hidden", isPack);
+		$("#vitalityCompareSelect").prop("disabled", isPack);
+		$("#vitalityValueInput").prop("hidden", isPack);
+		$("#signetSelect").prop("disabled", isPack);
+		$("#siteNumberCompareSelect").prop("disabled", isPack);
+		$("#siteNumberValueInput").prop("hidden", isPack);
+		$("#resistanceCompareSelect").prop("disabled", isPack);
+		$("#resistanceValueInput").prop("hidden", isPack);
 
-        // Reset buttons
-        $("#resetAdvancedFiltersButton").click(
-                function (event) {
-                    that.pauseUpdates = true;
-                    $("#nameInput, #gametextInput" +
-                      ", #keywordSelect, #raceSelect, #itemClassSelect, #phaseSelect, " +
-                      ", #twilightCompareSelect, #twilightValueInput" +
-                      ", #strengthCompareSelect, #strengthValueInput" +
-                      ", #vitalityCompareSelect, #vitalityValueInput" + 
-                      ", #signetSelect" +
-                      ", #siteNumberCompareSelect, #siteNumberValueInput" +
-                      ", #resistanceCompareSelect, #resistanceValueInput").val('').trigger('change');
-                    that.pauseUpdates = false;
-                    fullFilterChanged();
-                    
-                    // $("#labelDWARVEN, #labelELVEN, #labelGANDALF, #labelGONDOR, #labelROHAN, #labelSHIRE" +
-                    //   ", #labelGOLLUM, #labelDUNLAND, #labelISENGARD, #labelMORIA, #labelRAIDER, #labelSAURON" +
-                    //   ", #labelMEN, #labelORC, #labelURUK_HAI, #labelWRAITH" +
-                    //   ", #labelESGAROTH, #labelGUNDABAD, #labelMIRKWOOD, #labelSMAUG, #labelSPIDER, #labelTROLL").removeClass("ui-state-active");
-                });
-        $("#resetAllFiltersButton").click(
-                function (event) {
-                    that.pauseUpdates = true;
-                    $("#productSelect, #raritySelect, #sideSelect, #sortSelect, #setSelect, #cardTypeSelect" +
-                      ", #nameInput, #gametextInput" +
-                      ", #keywordSelect, #raceSelect, #itemClassSelect, #phaseSelect, " +
-                      ", #twilightCompareSelect, #twilightValueInput" +
-                      ", #strengthCompareSelect, #strengthValueInput" +
-                      ", #vitalityCompareSelect, #vitalityValueInput" + 
-                      ", #signetSelect" +
-                      ", #siteNumberCompareSelect, #siteNumberValueInput" +
-                      ", #resistanceCompareSelect, #resistanceValueInput").val('').trigger('change');
-                    
-                    $("#DWARVEN, #ELVEN, #GANDALF, #GONDOR, #ROHAN, #SHIRE" +
-                      ", #GOLLUM, #DUNLAND, #ISENGARD, #MORIA, #RAIDER, #SAURON" +
-                      ", #MEN, #ORC, #URUK_HAI, #WRAITH" +
-                      ", #ESGAROTH, #GUNDABAD, #MIRKWOOD, #SMAUG, #SPIDER, #TROLL").prop("checked", false).change();
-                    that.pauseUpdates = false;
-                    fullFilterChanged();
-                });
+		return that.compareTypeChanged(that);
+	},
+	
+	resetFields: function(name) {
+		if ($("#" + name + "CompareSelect option:selected").prop("value") == "") {
+			$("#" + name + "ValueInput").prop("hidden", true);
+			$("#" + name + "ValueInput").prop("value", '');
+		}
+		else {
+			$("#" + name + "ValueInput").prop("hidden", false);
+		}
+	},
 
-        // Triggers for filter fields changed
-        $("#productSelect").change(productChanged);
-        
-        $("#sideSelect, #setSelect, #cardTypeSelect, #raritySelect, #sortSelect, #nameInput, #gametextInput" +
-          ", #keywordSelect, #raceSelect, #itemClassSelect, #phaseSelect, " +
-          ", #twilightValueInput, #strengthValueInput, #vitalityValueInput, #signetSelect" +
-          ", #siteNumberValueInput, #resistanceValueInput").change(setFilterChanged);
+	// Callback function for when a filter compare is changed, to switch
+	// all of the numeric comparison dropdowns to a default state
+	compareTypeChanged: function(that) {
+		that.resetFields("twilight");
+		that.resetFields("strength");
+		that.resetFields("vitality");
+		that.resetFields("siteNumber");
+		that.resetFields("resistance");
+		return that.filterChanged();
+	},
 
-        $("#twilightCompareSelect, #strengthCompareSelect, #vitalityCompareSelect" +
-          ", #siteNumberCompareSelect, #resistanceCompareSelect").change(compareTypeChanged);
-        
-        $("#DWARVEN, #ELVEN, #GANDALF, #GONDOR, #ROHAN, #SHIRE" +
-                      ", #GOLLUM, #DUNLAND, #ISENGARD, #MORIA, #RAIDER, #SAURON" +
-                      ", #MEN, #ORC, #URUK_HAI, #WRAITH" +
-                      ", #ESGAROTH, #GUNDABAD, #MIRKWOOD, #SMAUG, #SPIDER, #TROLL").change(setFilterChanged);
-        
-        // $("#labelDWARVEN, #labelELVEN, #labelGANDALF, #labelGONDOR, #labelROHAN, #labelSHIRE" +
-        //               ", #labelGOLLUM, #labelDUNLAND, #labelISENGARD, #labelMORIA, #labelRAIDER, #labelSAURON" +
-        //               ", #labelMEN, #labelORC, #labelURUK_HAI, #labelWRAITH" +
-        //               ", #labelESGAROTH, #labelGUNDABAD, #labelMIRKWOOD, #labelSMAUG, #labelSPIDER, #labelTROLL").click(setFilterChanged);
-        
-        this.collectionDiv = $("<div id='collection-display' style='display:flex;flex-direction:column;position:relative;'></div>");
-        //collection-display
-        pageElem.append(this.collectionDiv);
-    },
-    
-    generateNumericComparator(id, labelText) {
-        this[id + "Label"] = $("<label for='" + id + "CompareSelect' class='filterLabel'>" + labelText + ":</label>");
-        this[id + "CompareSelect"] = $("<select id='" + id + "CompareSelect' class='filterInput'>"
-            + "<option value='' selected='selected'>Any</option>"
-            + "<option value='EQUALS'>=</option>"
-            + "<option value='GREATER_THAN'>></option>"
-            + "<option value='GREATER_THAN_OR_EQUAL_TO'>>=</option>"
-            + "<option value='LESS_THAN'><</option>"
-            + "<option value='LESS_THAN_OR_EQUAL_TO'><=</option>"
-            + "</select>");
-        this[id + "ValueInput"] = $("<input id='" + id + "ValueInput' type='number' min = '0' max='12' class='filterInput' style='width: 35px;'>");
-    },
+	// Callback function for when a filter is changed
+	filterChanged: function() {
+		var newFilterString = this.calculateDeckFilter();
+		// Only re-gather collection if filter actually changed from previous filter
+		if (this.filter != newFilterString) {
+			this.filter = newFilterString
+			this.start = 0;
+			this.getCollection();
+		}
+		return true;
+	},
+	
+	updateFormat: function(formatCode, blocks) {
+		var that = this;
+		this.currentFormat = formatCode;
+		this.blocks = blocks;
+		
+		this.blockSelect = $("#blockSelect");
+		this.blockSelect.empty();
+		let defaultOption = $("<option/>")
+						.attr("value", "")
+						.attr("selected", "selected")
+						.text("Any");
+		this.blockSelect.append(defaultOption);
+		
+		for(const block of blocks) {
+			var option = $("<option/>")
+						.attr("value", block.filter)
+						.text(block.name);
+			this.blockSelect.append(option)
+		}
+		
+		
+		if(blocks.length == 1) {
+			$("#blockSelect").prop('selectedIndex', 1);
+		} 
+		else {
+			$("#blockSelect").prop('selectedIndex', 0);
+		}
+			
+		
+		this.blockSelect.change(function () {  
+				that.setSelect = $("#setSelect");
+				that.setSelect.empty();
+				let defaultOption = $("<option/>")
+								.attr("value", "")
+								.attr("selected", "selected")
+								.text("Any");
+				that.setSelect.append(defaultOption);
+				
+				if($("#blockSelect").val() == "") {
+					
+					for(const block of that.blocks) {
+						let setEntries = Object.entries(block.setFilters);
+						for(const [name, code] of setEntries) {
+							var option = $("<option/>")
+										.attr("value", code)
+										.text(name);
+							that.setSelect.append(option)
+						}
+					}
+					
+				}
+				else {
+					let currentBlock = that.blocks.find((x) => x.filter == that.blockSelect.val());
+					
+					if(currentBlock) {
+						let setEntries = Object.entries(currentBlock.setFilters);
+						for(const [name, code] of setEntries) {
+							var option = $("<option/>")
+										.attr("value", code)
+										.text(name);
+							that.setSelect.append(option)
+						}
+					}
+				}
+				
+				$("#setSelect").html($("#setSelect option").sort(function (a, b) {
+					let av = a.value == "" ? 0 : parseInt(a.value, 10);
+					let bv = b.value == "" ? 0 : parseInt(b.value, 10);
+					return av == bv ? 0 : av < bv ? -1 : 1
+				}));
+				
+				// "Any" + the 1 actual entry
+				if($("#setSelect option").length == 2) {
+					$("#setSelect").prop('selectedIndex', 1);
+				} 
+				else {
+					$("#setSelect").prop('selectedIndex', 0);
+				}
 
-    layoutUi: function (x, y, width, height) {
-        //this.pageDiv.css({position: "absolute", left: x, top: y, width: width, height: 34});
-        //this.countSlider.css({width: width - 100});
-        //this.fullFilterDiv.css({position: "absolute", left: x, top: y + 34, width: width, height: 34});
-        //this.filterDiv.css({position: "absolute", left: x, top: y + 68, width: width, height: 80});
-    },
+				that.setFilterChanged(that);
+			});
+		
+		this.blockSelect.change();
+		
+		// setSelect = $("<select id='setSelect' class='filterInput'></select>"
+		//     + "<option value='0-34,50-200' selected='selected'>All Sets</option>"
+		//     + "<option value='0-19'>Official Decipher Sets</option>"
+		//     + "<option value='30-33'>The Hobbit Sets</option>"
+		//     + "<option value='50-69,100'>Player's Council Errata</option>"
+		//     + "<option value='100-149'>Player's Council VSets</option>"
+		//     + "<option value='50-69,100-149'>All Player's Council Cards</option>"
+		//     + "<option disabled>----------</option>"
+		//     + "<option value='fotr_block'>Fellowship Block</option>"
+		//     + "<option value='pc_fotr_block'>Fellowship Block (PC)</option>"
+		//     + "<option value='ttt_block'>Towers Block</option>"
+		//     + "<option value='king_block'>King Block</option>"
+		//     + "<option value='war_block'>War of the Ring Block</option>"
+		//     + "<option value='hunter_block'>Hunters Block</option>"
+		//     + "<option value='towers_standard'>Towers Standard</option>"
+		//     + "<option value='ts_reflections'>Enhanced Towers Standard</option>"            
+		//     + "<option value='rotk_sta'>King Standard</option>"
+		//     + "<option value='movie'>Movie Block</option>"
+		//     + "<option value='pc_movie'>Movie Block (PC)</option>"
+		//     + "<option value='war_standard'>War of the Ring standard</option>"
+		//     + "<option value='standard'>Standard</option>"
+		//     + "<option value='expanded'>Expanded</option>"
+		//     + "<option value='pc_expanded'>Expanded (PC)</option>"
+		//     + "<option value='french'>French Format</option>"
+		//     + "<option disabled>----------</option>"
+		//     + "<option value='0'>00 - Promo</option>"
+		//     + "<option value='1'>01 - The Fellowship of the Ring</option>"
+		//     + "<option value='51'>01E - The Fellowship of the Ring (PC Errata)</option>"
+		//     + "<option value='2'>02 - Mines of Moria</option>"
+		//     + "<option value='52'>02E - Mines of Moria (PC Errata)</option>"
+		//     + "<option value='3'>03 - Realms of the Elf-lords</option>"
+		//     + "<option value='53'>03E - Realms of the Elf-lords (PC Errata)</option>"
+		//     + "<option value='4'>04 - The Two Towers</option>"
+		//     + "<option value='54'>04E - The Two Towers (PC Errata)</option>"
+		//     + "<option value='5'>05 - Battle of Helm's Deep</option>"
+		//     + "<option value='6'>06 - Ents of Fangorn</option>"
+		//     + "<option value='7'>07 - The Return of the King</option>"
+		//     + "<option value='57'>07E - The Return of the King (PC Errata)</option>"
+		//     + "<option value='8'>08 - Siege of Gondor</option>"
+		//     + "<option value='58'>08E - Siege of Gondor (PC Errata)</option>"
+		//     + "<option value='9'>09 - Reflections</option>"
+		//     + "<option value='59'>09E - Reflections (PC Errata)</option>"
+		//     + "<option value='10'>10 - Mount Doom</option>"
+		//     + "<option value='60'>10E - Mount Doom (PC Errata)</option>"
+		//     + "<option value='11'>11 - Shadows</option>"
+		//     + "<option value='61'>11E - Shadows (PC Errata)</option>"
+		//     + "<option value='12'>12 - Black Rider</option>"
+		//     + "<option value='13'>13 - Bloodlines</option>"
+		//     + "<option value='63'>13E - Bloodlines (PC Errata)</option>"
+		//     + "<option value='14'>14 - Expanded Middle-earth</option>"
+		//     + "<option value='15'>15 - The Hunters</option>"
+		//     + "<option value='65'>15E - The Hunters (PC Errata)</option>"
+		//     + "<option value='16'>16 - The Wraith Collection</option>"
+		//     + "<option value='17'>17 - Rise of Saruman</option>"
+		//     + "<option value='18'>18 - Treachery & Deceit</option>"
+		//     + "<option value='19'>19 - Ages End</option>"
+		//     + "<option value='69'>19E - Ages End (PC Errata)</option>"
+		//     + "<option value='101,151'>V1 - Shadow of the Past (PC)</option>"
+		//     + "<option value='102,152'>V2 - King of the Golden Hall (PC)</option>"
+		//     + "<option value='30'>30 - The Hobbit: Main Deck</option>"
+		//     + "<option value='31'>31 - The Hobbit: Expansion 1</option>"
+		//     + "<option value='32'>32 - The Hobbit: Expansion 2</option>"
+		//     + "<option value='33'>33 - The Hobbit: Expansion 3</option>"
+		//     + "<option disabled>----------</option>"
+		//     + "<option value='70-89,150-200'>All Player's Council Playtest Cards</option>"
+		//     //+ "<option value='151'>PLAYTEST - Shadow of the Past (PC)</option>"
+		//     + "<option value='test_pc_fotr_block'>PLAYTEST - Fellowship Block (PC)</option>"
+		//     + "<option value='test_pc_movie'>PLAYTEST - Movie Block (PC)</option>"
+		//     + "<option value='test_pc_expanded'>PLAYTEST - Expanded (PC)</option>"
+			
+		//     + "</select>");
+	},
 
-    layoutPageUi: function (x, y, width) {
-        //this.pageDiv.css({left: x, top: y, width: width, height: 36});
-        //this.countSlider.css({width: width - 100});
-    },
+	layoutUi: function (x, y, width, height) {
+		//this.pageDiv.css({position: "absolute", left: x, top: y, width: width, height: 34});
+		//this.countSlider.css({width: width - 100});
+		//this.fullFilterDiv.css({position: "absolute", left: x, top: y + 34, width: width, height: 34});
+		//this.filterDiv.css({position: "absolute", left: x, top: y + 68, width: width, height: 80});
+	},
 
-    disableNavigation: function () {
-        this.previousPageBut.button("option", "disabled", true);
-        this.nextPageBut.button("option", "disabled", true);
-        this.countSlider.button("option", "disabled", true);
-    },
+	layoutPageUi: function (x, y, width) {
+		//this.pageDiv.css({left: x, top: y, width: width, height: 36});
+		//this.countSlider.css({width: width - 100});
+	},
 
-    calculateDeckFilter: function (predefFilter) {
-        
-        if(predefFilter === undefined)
-            predefFilter = ""
-        
-        // Generates the filter string based on the current filter selections
-        
-        var cultures = new Array();
-        $("label", $("#culture-buttons")).each(
-            function () {
-                if ($(this).hasClass("ui-state-active"))
-                    cultures.push($(this).prop("for"));
-            });
-        var culture = "";
-        if(cultures.length > 0 && !predefFilter.includes("culture:")) {
-            culture = " culture:" + cultures;
-        }
-        
-        var product = $("#productSelect option:selected").prop("value");
-        if (product != "" && !predefFilter.includes("product:"))
-            product = " product:" + product; 
-            
-        var rarity = $("#raritySelect option:selected").prop("value");
-        if (rarity != "" && !predefFilter.includes("rarity:"))
-            rarity = " rarity:" + rarity;       
-        
-        var side = $("#sideSelect option:selected").prop("value");
-        if (side != "" && !predefFilter.includes("side:"))
-            side = " side:" + side;
-        
-        var sort = $("#sortSelect option:selected").prop("value");
-        if (sort != "" && !predefFilter.includes("sort:"))
-            sort = " sort:" + sort;
+	disableNavigation: function () {
+		this.previousPageBut.button("option", "disabled", true);
+		this.nextPageBut.button("option", "disabled", true);
+		this.countSlider.button("option", "disabled", true);
+	},
 
-        var set = $("#setSelect option:selected").prop("value");
-        if (set != "" && !predefFilter.includes("set:"))
-            set = " set:" + set;
+	calculateDeckFilter: function (predefFilter) {
+		
+		if(predefFilter === undefined)
+			predefFilter = this.overrideFilter
+		
+		// Generates the filter string based on the current filter selections
+		
+		var cultures = new Array();
+		$("label", $("#culture-buttons")).each(
+			function () {
+				if ($(this).hasClass("ui-state-active"))
+					cultures.push($(this).prop("for"));
+			});
+		var culture = "";
+		if(cultures.length > 0 && !predefFilter.includes("culture:")) {
+			culture = " culture:" + cultures;
+		}
+		
+		var product = $("#productSelect option:selected").prop("value");
+		if (product != "" && !predefFilter.includes("product:"))
+			product = " product:" + product; 
+			
+		var rarity = $("#raritySelect option:selected").prop("value");
+		if (rarity != "" && !predefFilter.includes("rarity:"))
+			rarity = " rarity:" + rarity;       
+		
+		var side = $("#sideSelect option:selected").prop("value");
+		if (side != "" && !predefFilter.includes("side:"))
+			side = " side:" + side;
+		
+		var sort = $("#sortSelect option:selected").prop("value");
+		if (sort != "" && !predefFilter.includes("sort:"))
+			sort = " sort:" + sort;
+		
+		var format = this.currentFormat;
+		if (format)
+			format = " format:" + format;
+		else
+			format = "";
 
-        var cardType = $("#cardTypeSelect option:selected").prop("value");
-        if (cardType != "" && !predefFilter.includes("cardType:"))
-            cardType = " cardType:" + cardType;
-        
-        var name = $("#nameInput").prop("value");
-        if (name.trim() != "" && !predefFilter.includes("name:")) {
-            var nameElems = name.split(" ");
-            name = "";
-            for (var i = 0; i < nameElems.length; i++)
-                name += " name:" + nameElems[i];
-        }
+		var block = $("#blockSelect option:selected").prop("value");
+		if (block)
+			block = " block:" + block;
+		
+		var set = $("#setSelect option:selected").prop("value");
+		if (set)
+			set = " set:" + set;
 
-        var gametext = $("#gametextInput").prop("value");
-        if (gametext != "" && !predefFilter.includes("gametext:")) {
-            gametext = " gametext:" + gametext.replace(" ", "_");
-        }
-        
-        var keyword = $("#keywordSelect option:selected").prop("value");
-        if (keyword != "" && !predefFilter.includes("keyword:"))
-            keyword = " keyword:" + keyword;
-        
-        var phase = $("#phaseSelect option:selected").prop("value");
-        if (phase != "" && !predefFilter.includes("phase:"))
-            phase = " phase:" + phase;   
+		var cardType = $("#cardTypeSelect option:selected").prop("value");
+		if (cardType != "")
+			cardType = " cardType:" + cardType;
+		
+		var name = $("#nameInput").prop("value");
+		if (name.trim() != "" && !predefFilter.includes("name:")) {
+			var nameElems = name.split(" ");
+			name = "";
+			for (var i = 0; i < nameElems.length; i++)
+				name += " name:" + nameElems[i];
+		}
 
-        var race = $("#raceSelect option:selected").prop("value");
-        if (race != "" && !predefFilter.includes("race:"))
-            race = " race:" + race;
+		var gametext = $("#gametextInput").prop("value");
+		if (gametext != "" && !predefFilter.includes("gametext:")) {
+			gametext = " gametext:" + gametext.replace(" ", "_");
+		}
+		
+		var keyword = $("#keywordSelect option:selected").prop("value");
+		if (keyword != "" && !predefFilter.includes("keyword:"))
+			keyword = " keyword:" + keyword;
+		
+		var phase = $("#phaseSelect option:selected").prop("value");
+		if (phase != "" && !predefFilter.includes("phase:"))
+			phase = " phase:" + phase;   
 
-        var itemClass = $("#itemClassSelect option:selected").prop("value");
-        if (itemClass != "" && !predefFilter.includes("itemClass:"))
-            itemClass = " itemClass:" + itemClass
+		var race = $("#raceSelect option:selected").prop("value");
+		if (race != "" && !predefFilter.includes("race:"))
+			race = " race:" + race;
 
-        var twilightCompare = $("#twilightCompareSelect option:selected").prop("value");
-        var twilight = $("#twilightValueInput").prop("value");
-        if (twilightCompare != "" && twilight != ""  && !predefFilter.includes("twilight:")) {
-            twilight = " twilightCompare:" + twilightCompare + " twilight:" + twilight;
-        }
-        else {
-            twilight = "";
-        }
-        
-        var siteNumberCompare = $("#siteNumberCompareSelect option:selected").prop("value");
-        var siteNumber = $("#siteNumberValueInput").prop("value");
-        if (siteNumberCompare != "" && siteNumber != "" && !predefFilter.includes("siteNumber:")) {
-            siteNumber = " siteNumberCompare:" + siteNumberCompare + " siteNumber:" + siteNumber;
-        }
-        else {
-            siteNumber = "";
-        }
+		var itemClass = $("#itemClassSelect option:selected").prop("value");
+		if (itemClass != "" && !predefFilter.includes("itemClass:"))
+			itemClass = " itemClass:" + itemClass
 
-        var strengthCompare = $("#strengthCompareSelect option:selected").prop("value");
-        var strength = $("#strengthValueInput").prop("value");
-        if (strengthCompare != "" && strength != ""  && !predefFilter.includes("strength:")) {
-            strength = " strengthCompare:" + strengthCompare + " strength:" + strength;
-        }
-        else {
-            strength = "";
-        }
-        
-        var vitalityCompare = $("#vitalityCompareSelect option:selected").prop("value");
-        var vitality = $("#vitalityValueInput").prop("value");
-        if (vitalityCompare != "" && vitality != "" && !predefFilter.includes("vitality:")) {
-            vitality = " vitalityCompare:" + vitalityCompare + " vitality:" + vitality;
-        }
-        else {
-            vitality = "";
-        }
-        
-        var signet = $("#signetSelect option:selected").prop("value");
-        if (signet != "")
-            signet = " signet:" + signet;
-        
-        var resistanceCompare = $("#resistanceCompareSelect option:selected").prop("value");
-        var resistance = $("#resistanceValueInput").prop("value");
-        if (resistanceCompare != "" && resistance != "" && !predefFilter.includes("resistance:")) {
-            resistance = " resistanceCompare:" + resistanceCompare + " resistance:" + resistance;
-        }
-        else {
-            resistance = "";
-        }
+		var twilightCompare = $("#twilightCompareSelect option:selected").prop("value");
+		var twilight = $("#twilightValueInput").prop("value");
+		if (twilightCompare != "" && twilight != ""  && !predefFilter.includes("twilight:")) {
+			twilight = " twilightCompare:" + twilightCompare + " twilight:" + twilight;
+		}
+		else {
+			twilight = "";
+		}
+		
+		var siteNumberCompare = $("#siteNumberCompareSelect option:selected").prop("value");
+		var siteNumber = $("#siteNumberValueInput").prop("value");
+		if (siteNumberCompare != "" && siteNumber != "" && !predefFilter.includes("siteNumber:")) {
+			siteNumber = " siteNumberCompare:" + siteNumberCompare + " siteNumber:" + siteNumber;
+		}
+		else {
+			siteNumber = "";
+		}
 
-        var filterString = side + set + cardType + rarity + sort + product + culture + name 
-                + gametext
-                + keyword + phase + race + itemClass
-                + twilight + strength + vitality + resistance + siteNumber + signet;
+		var strengthCompare = $("#strengthCompareSelect option:selected").prop("value");
+		var strength = $("#strengthValueInput").prop("value");
+		if (strengthCompare != "" && strength != ""  && !predefFilter.includes("strength:")) {
+			strength = " strengthCompare:" + strengthCompare + " strength:" + strength;
+		}
+		else {
+			strength = "";
+		}
+		
+		var vitalityCompare = $("#vitalityCompareSelect option:selected").prop("value");
+		var vitality = $("#vitalityValueInput").prop("value");
+		if (vitalityCompare != "" && vitality != "" && !predefFilter.includes("vitality:")) {
+			vitality = " vitalityCompare:" + vitalityCompare + " vitality:" + vitality;
+		}
+		else {
+			vitality = "";
+		}
+		
+		var signet = $("#signetSelect option:selected").prop("value");
+		if (signet != "")
+			signet = " signet:" + signet;
+		
+		var resistanceCompare = $("#resistanceCompareSelect option:selected").prop("value");
+		var resistance = $("#resistanceValueInput").prop("value");
+		if (resistanceCompare != "" && resistance != "" && !predefFilter.includes("resistance:")) {
+			resistance = " resistanceCompare:" + resistanceCompare + " resistance:" + resistance;
+		}
+		else {
+			resistance = "";
+		}
 
-        return filterString.trim();
-    },
+		var filterString = side + format + block + set + cardType + rarity + sort + product + culture 
+				+ name + gametext
+				+ keyword + phase + race + itemClass
+				+ twilight + strength + vitality + resistance + siteNumber + signet
+				+ " " + predefFilter;
 
-    getCollection: function () {
-        var that = this;
-        this.getCollectionFunc(this.filter, this.start, this.count, function (xml) {
-            that.displayCollection(xml);
-        });
-    },
+		console.log("Regenerating filter: " + filterString);
+		return filterString.trim();
+	},
 
-    displayCollection: function (xml) {
-        log(xml);
-        var root = xml.documentElement;
+	getCollection: function () {
+		var that = this;
+		console.log("Updating collection");
+		this.getCollectionFunc(this.filter, this.start, this.count, function (xml) {
+			that.displayCollection(xml);
+		});
+	},
 
-        this.clearCollectionFunc(root);
+	displayCollection: function (xml) {
+		log(xml);
+		var root = xml.documentElement;
 
-        var packs = root.getElementsByTagName("pack");
-        for (var i = 0; i < packs.length; i++) {
-            var packElem = packs[i];
-            var blueprintId = packElem.getAttribute("blueprintId");
-            var count = packElem.getAttribute("count");
-            this.addCardFunc(packElem, "pack", blueprintId, count);
-        }
+		this.clearCollectionFunc(root);
 
-        var cards = root.getElementsByTagName("card");
-        for (var i = 0; i < cards.length; i++) {
-            var cardElem = cards[i];
-            var blueprintId = cardElem.getAttribute("blueprintId");
-            var count = cardElem.getAttribute("count");
-            this.addCardFunc(cardElem, "card", blueprintId, count);
-        }
+		var packs = root.getElementsByTagName("pack");
+		for (var i = 0; i < packs.length; i++) {
+			var packElem = packs[i];
+			var blueprintId = packElem.getAttribute("blueprintId");
+			var count = packElem.getAttribute("count");
+			this.addCardFunc(packElem, "pack", blueprintId, count);
+		}
 
-        this.finishCollectionFunc();
+		var cards = root.getElementsByTagName("card");
+		for (var i = 0; i < cards.length; i++) {
+			var cardElem = cards[i];
+			var blueprintId = cardElem.getAttribute("blueprintId");
+			var count = cardElem.getAttribute("count");
+			this.addCardFunc(cardElem, "card", blueprintId, count);
+		}
 
-        $("#previousPage").button("option", "disabled", this.start == 0);
-        var cnt = parseInt(root.getAttribute("count"));
-        $("#nextPage").button("option", "disabled", (this.start + this.count) >= cnt);
-        $("#countSlider").slider("option", "disabled", false);
-    }
+		this.finishCollectionFunc();
+
+		$("#previousPage").button("option", "disabled", this.start == 0);
+		var cnt = parseInt(root.getAttribute("count"));
+		$("#nextPage").button("option", "disabled", (this.start + this.count) >= cnt);
+		$("#countSlider").slider("option", "disabled", false);
+	}
 });
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/deckBuildingUi.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/deckBuildingUi.js
index 1488c06c4..5579d7987 100644
--- a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/deckBuildingUi.js
+++ b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/deckBuildingUi.js
@@ -1,1227 +1,1245 @@
 var GempLotrDeckBuildingUI = Class.extend({
-    comm:null,
-
-    deckDiv:null,
-
-    manageDecksDiv:null,
-
-    ringBearerDiv:null,
-    ringBearerGroup:null,
-
-    ringDiv:null,
-    ringGroup:null,
-    
-    mapDiv:null,
-    mapGroup:null,
-    showMap:false,
-
-    siteDiv:null,
-    siteGroup:null,
-
-    collectionDiv:null,
-    formatSelect:null,
-    currentFormat:null,
-    notes:null,
-
-    normalCollectionDiv:null,
-    normalCollectionGroup:null,
-
-    selectionFunc:null,
-    drawDeckDiv:null,
-
-    fpDeckGroup:null,
-    shadowDeckGroup:null,
-
-    start:0,
-    count:18,
-    filter:null,
-
-    deckName:null,
-
-    filterDirty:false,
-    deckValidationDirty:true,
-    deckContentsDirty:true,
-
-    checkDirtyInterval:500,
-
-    deckListDialog:null,
-    selectionDialog:null,
-    selectionGroup:null,
-    packSelectionId:null,
-    deckImportDialog:null,
-    notesDialog:null,
-
-    cardFilter:null,
-
-    collectionType:null,
-
-    specialSelection:false,
-    
-    autoZoom: null,
-    cardInfoDialog: null,
-
-    init:function () {
-        var that = this;
-
-        this.comm = new GempLotrCommunication("/gemp-lotr-server", that.processError);
-
-        this.collectionType = "default";
-        
-        this.cardFilter = new CardFilter($("#collectionDiv"),
-                function (filter, start, count, callback) {
-                    if (!that.specialSelection) {
-                        filter = filter + " cardType:-THE_ONE_RING";
-                    }
-                    that.comm.getCollection(that.collectionType, filter, start, count, function (xml) {
-                        callback(xml);
-                    }, {
-                        "404":function () {
-                            alert("You don't have collection of that type.");
-                        }
-                    });
-                },
-                function () {
-                    that.clearCollection();
-                },
-                function (elem, type, blueprintId, count) {
-                    that.addCardToCollection(type, blueprintId, count, elem.getAttribute("side"), elem.getAttribute("contents"));
-                },
-                function () {
-                    that.finishCollection();
-                });
-        
-
-        this.deckDiv = $("#deckDiv");
-
-        this.manageDecksDiv = $("#manageDecks");
-        
-        this.formatSelect = $("#formatSelect");
-        $("#formatSelect").change(
-                function () {
-                    that.deckModified(true);
-                    let formatCode = that.formatSelect.val();
-                    if(formatCode == "pc_movie" || formatCode == "test_pc_movie") {
-                        that.setMapVisibility(true);
-                    }
-                    else {
-                        that.setMapVisibility(false);
-                    }
-                });
-        
-        this.autoZoom = new AutoZoom("autoZoomInDeckbuilder");
-
-        var collectionSelect = $("#collectionSelect");
-
-        var newDeckBut = $("#newDeckBut").button();
-
-        var saveDeckBut = $("#saveDeckBut").button();
-
-        var renameDeckBut = $("#renameDeckBut").button();
-
-        var copyDeckBut = $("#copyDeckBut").button();
-        
-        var importDeckBut = $("#importDeckBut").button();
-        
-        var libraryListBut = $("#libraryListBut").button();
-
-        var deckListBut = $("#deckListBut").button();
-        
-        var notesBut = $("#notesBut").button();
-        
-        if(this.autoZoom.autoZoomToggle != null) {
-            this.autoZoom.autoZoomToggle.appendTo(this.manageDecksDiv);
-        }
-
-        this.deckNameSpan = ("#editingDeck");
-
-        newDeckBut.click(
-                function () {
-                    that.deckName = null;
-                    $("#editingDeck").text("New deck");
-                    that.clearDeck();
-                });
-
-        saveDeckBut.click(
-                function () {
-                    if (that.deckName == null) {
-                        var newDeckName = prompt("Enter the name of the deck", "");
-                        if (newDeckName == null)
-                            return;
-                        if (newDeckName.length < 3 || newDeckName.length > 100)
-                            alert("Deck name has to have at least 3 characters and at most 100 characters.");
-                        else {
-                            that.deckName = newDeckName;
-                            $("#editingDeck").text(newDeckName);
-                            that.saveDeck(true);
-                        }
-                    } else {
-                        that.saveDeck(false);
-                    }
-                });
-
-        renameDeckBut.click(
-                function () {
-                    if (that.deckName == null) {
-                        alert("You can't rename this deck, since it's not named (saved) yet.");
-                        return;
-                    }
-                    that.renameCurrentDeck();
-                });
-
-        copyDeckBut.click(
-                function () {
-                    that.deckName = null;
-                    $("#editingDeck").text("New deck");
-                });
-
-        deckListBut.click(
-                function () {
-                    that.loadDeckList();
-                });
-        
-        libraryListBut.click(
-                function () {
-                    that.loadLibraryList();
-                });
-
-        importDeckBut.click(
-                function () {
-                    that.deckName = null;
-                    that.importDecklist();
-                });
-        
-        notesBut.click(
-               function () {
-                    that.editNotes();
-               });
-
-        this.collectionDiv = $("#collectionDiv");
-
-        $("#collectionSelect").change(
-                function () {
-                    that.collectionType = that.getCollectionType();
-                    that.cardFilter.getCollection();
-                });
-
-        this.normalCollectionDiv = $("#collection-display");
-        this.normalCollectionGroup = new NormalCardGroup(this.normalCollectionDiv, function (card) {
-            return true;
-        });
-        this.normalCollectionGroup.maxCardHeight = 200;
-
-        this.ringBearerDiv = $("#ringBearerDiv");
-        this.ringBearerDiv.click(
-                function () {
-                    if ($(".card", that.ringBearerDiv).length == 0) {
-                        that.showPredefinedFilter("canStartWithRing:true product:card", that.ringBearerDiv);
-                    }
-                });
-        this.ringBearerGroup = new NormalCardGroup(this.ringBearerDiv, function (card) {
-            return true;
-        }, false, $("#rb-content"));
-
-        this.ringDiv = $("#ringDiv");
-        this.ringDiv.click(
-                function () {
-                    if ($(".card", that.ringDiv).length == 0)
-                        that.showPredefinedFilter("cardType:THE_ONE_RING product:card", that.ringDiv);
-                });
-        this.ringGroup = new NormalCardGroup(this.ringDiv, function (card) {
-            return true;
-        }, false, $("#ring-content"));
-        
-        this.mapDiv = $("#map-div");
-        this.mapDiv.click(
-                function () {
-                    if ($(".card", that.mapDiv).length == 0)
-                        that.showPredefinedFilter("cardType:MAP product:card", that.mapDiv);
-                });
-        this.mapGroup = new NormalCardGroup(this.mapDiv, function (card) {
-            return true;
-        }, false, $("#map-content"));
-
-        this.siteDiv = $("#sitesDiv");
-        this.siteDiv.click(
-                function () {
-                    $("#cardTypeSelect").val('SITE').trigger('change');
-                    $("#sortSelect").val('siteNumber,name').trigger('change');
-                });
-        this.siteGroup = new VerticalBarGroup(this.siteDiv, function (card) {
-            return true;
-        }, false, $("#sites-content"));
-
-        this.drawDeckDiv = $("#decksRegion");
-        this.fpDeckGroup = new NormalCardGroup(this.drawDeckDiv, function (card) {
-            return (card.zone == "FREE_PEOPLE");
-        });
-        this.fpDeckGroup.maxCardHeight = 200;
-        this.shadowDeckGroup = new NormalCardGroup(this.drawDeckDiv, function (card) {
-            return (card.zone == "SHADOW");
-        });
-        this.shadowDeckGroup.maxCardHeight = 200;
-
-        this.bottomBarDiv = $("#statsDiv");
-
-        this.selectionFunc = this.addCardToDeckAndLayout;
-
-        $("body").click(
-                function (event) {
-                    return that.clickCardFunction(event);
-                });
-        $("body")[0].addEventListener("contextmenu",
-            function (event) {
-                if(!that.clickCardFunction(event))
-                {
-                    event.preventDefault();
-                    return false;
-                }
-                return true;
-            });
-        $('body').unbind('mouseover');
-        $("body").mouseover(
-            function (event) {
-                return that.autoZoom.handleMouseOver(event.originalEvent, 
-                   that.dragCardId != null, that.cardInfoDialog.isOpen());
-            });
-
-        $('body').unbind('mouseout');
-        $("body").mouseout(
-            function (event) {
-                return that.autoZoom.handleMouseOut(event.originalEvent);
-            });
-
-        $("body").mousedown(
-                function (event) {
-                    that.autoZoom.handleMouseDown(event.originalEvent);
-                    
-                    return that.dragStartCardFunction(event);
-                });
-        $("body").mouseup(
-                function (event) {
-                    return that.dragStopCardFunction(event);
-                });
-        
-        //If we ever add double-sided cards, this will be needed for
-        // the card hover.
-        
-        $('body').unbind('keydown');
-        $("body").keydown(
-            function (event) {
-                return that.autoZoom.handleKeyDown(event.originalEvent);
-            });
-
-        $('body').unbind('keyup');
-        $("body").keyup(
-            function (event) {
-                return that.autoZoom.handleKeyUp(event);
-            });
-
-        this.cardInfoDialog = new CardInfoDialog(window.innerWidth, window.innerHeight);
-
-        this.getCollectionTypes();
-
-        // this.cardFilter.setFilter("");
-        // this.cardFilter.getCollection();
-
-
-        setInterval(() => {
-            if (that.deckValidationDirty) {
-                that.deckValidationDirty = false;
-                that.updateDeckStats();
-            }
-        }, this.checkDirtyInterval);
-        
-        this.updateFormatOptions();
-    },
-    
-    setMapVisibility:function(value) {
-        this.showMap = value;
-        this.layoutUI(true);
-    },
-    
-    renameCurrentDeck:function() {
-        var that = this;
-        that.renameDeck(that.deckName, function (newDeckName) {
-            
-            if (that.deckContentsDirty && confirm("Do you wish to save this deck?"))
-            {
-                that.saveDeck(false);
-            }
-            that.deckName = newDeckName;
-            that.deckModified(that.deckContentsDirty);
-        });
-    },
-    
-    renameDeck:function(oldName, callback) {
-        var that = this;
-        
-        var newDeckName = prompt("Enter new name for the deck", oldName);
-        if (newDeckName == null)
-            return;
-        
-        if (newDeckName.length < 3 || newDeckName.length > 100)
-            alert("Deck name has to have at least 3 characters and at most 100 characters.");
-        else {
-            that.comm.renameDeck(oldName, newDeckName, () => callback(newDeckName), 
-                {
-                    "404":function () {
-                        alert("Couldn't find the deck to rename on the server.");
-                    }
-                });
-        }
-    },
-
-    getCollectionType:function () {
-        return $("#collectionSelect option:selected").prop("value");
-    },
-
-    getCollectionTypes:function () {
-        var that = this;
-        this.comm.getCollectionTypes(
-                function (xml) {
-                    var root = xml.documentElement;
-                    if (root.tagName == "collections") {
-                        var collections = root.getElementsByTagName("collection");
-                        for (var i = 0; i < collections.length; i++) {
-                            var collection = collections[i];
-                            $("#collectionSelect").append("<option value='" + collection.getAttribute("type") + "'>" + collection.getAttribute("name") + "</option>");
-                            $("#formatSelect").append("<option value='" + collection.getAttribute("format") + "'>" + collection.getAttribute("name") + "</option>");
-                        }
-                    }
-                });
-    },
-    
-    importDecklist:function () {
-        var that = this;
-        if (that.deckImportDialog == null) {
-            that.deckImportDialog = $('<div></div>').dialog({
-                closeOnEscape:true,
-                resizable:true,
-                title:"Import deck"
-            });
-        }
-        that.deckImportDialog.html("");
-        var deckImport = $("<textarea rows='5' cols='30' id='deckImport' decklist='decklist'></textarea>");
-        var getDecklistTextBut = $("<button title='Import'>Import</button>").button();
-
-        var importDialogDiv = $("<div></div>");
-        importDialogDiv.append(deckImport);
-        importDialogDiv.append(getDecklistTextBut);
-        that.deckImportDialog.append(importDialogDiv);
-
-        getDecklistTextBut.click(
-             function () {
-                var decklist = $('textarea[decklist="decklist"]').val()
-                that.parseDecklist(decklist);
-            }
-        );
-        that.deckImportDialog.dialog("open");
-    },
-    
-    parseDecklist:function(rawText) {
-        this.clearDeck();
-        var that = this;
-        var rawTextList = rawText.split("\n");
-        var formattedText = "";
-        for (var i = 0; i < rawTextList.length; i++) {
-            if (rawTextList[i] != "") {
-                var line = that.removeNotes(rawTextList[i]).toLowerCase();
-                line = line.replace(/[\*•]/g,"").replace(/’/g,"'")
-                        .replace(/starting|start|map:|ring-bearer:|ring:/g,"")
-                formattedText = formattedText + line.trim() + "~";
-            }
-        }
-                
-        this.importDeckCollection(formattedText, function (xml) {
-            var cards = xml.documentElement.getElementsByTagName("card");
-            for (var i = 0; i < cards.length; i++) {
-                var cardElem = cards[i];
-                var blueprintId = cardElem.getAttribute("blueprintId");
-                var side = cardElem.getAttribute("side");
-                var group = cardElem.getAttribute("group");
-                var cardCount = parseInt(cardElem.getAttribute("count"));
-                for (var j = 0; j < cardCount; j++) {
-                    if (group == "ringBearer") {
-                        that.addCardToContainer(blueprintId, "special", that.ringBearerDiv, false).addClass("cardInDeck");
-                    } else if (group == "ring") {
-                        that.addCardToContainer(blueprintId, "special", that.ringDiv, false).addClass("cardInDeck");
-                    } else if (group == "map") {
-                        that.addCardToContainer(blueprintId, "special", that.mapDiv, false).addClass("cardInDeck");
-                    } else {
-                        that.addCardToDeckDontLayout(blueprintId, side);
-                    }
-                }
-            }
-            that.deckModified(true);
-            that.layoutDeck();
-            $("#editingDeck").text("Imported Deck (unsaved)");
-        });
-    },
-
-    removeNotes:function(line) {
-        var processedLine = line;
-        var hasNotes = false;
-        var start = line.indexOf("(");
-        var end = line.indexOf(")", start);
-        if (start < 0 && end < 0) {
-            start = line.indexOf("[");
-            end = line.indexOf("]", start);
-        }
-        if (start > 0) {
-            processedLine = line.slice(0,start)
-            if (end > 0) {
-                processedLine = processedLine + line.slice(end+1);
-            }
-        }
-        else if (end > 0) {
-            processedLine = line.slice(end+1);
-        }
-        if (processedLine.indexOf("(") > -1 || processedLine.indexOf(")") > -1 ||
-            processedLine.indexOf("[") > -1 || processedLine.indexOf("]") > -1) {
-                return this.removeNotes(processedLine);
-            }
-        return processedLine;
-    },
-
-    importDeckCollection:function (decklist, callback) {
-        this.comm.importCollection(decklist, function (xml) {
-            callback(xml);
-        }, {
-            "414":function () {
-                alert("Deck too large to import.");
-            }
-        });
-    },
-    
-    editNotes:function() {
-        var that = this;
-        that.notesDialog = $('<div class="notesDialog"></div>')
-            .dialog({
-                title:"Edit Deck Notes",
-                autoOpen:false,
-                closeOnEscape:true,
-                resizable:true,
-                width:700,
-                height:400,
-                modal:true
-            });
-            
-        var notesElem = $("<textarea class='notesText'></textarea>");
-            
-        notesElem.val(that.notes);
-        that.notesDialog.append(notesElem);
-        
-        notesElem.change(function() {
-            that.notes = notesElem.val();
-            that.deckModified(true);
-        });
-        
-        that.notesDialog.dialog("open");
-    },
-
-    loadDeckList:function () {
-        var that = this;
-        this.comm.getDecks(function (xml) {
-            if (that.deckListDialog == null) {
-                that.deckListDialog = $("<div></div>")
-                        .dialog({
-                    title:"Your Saved Decks",
-                    autoOpen:false,
-                    closeOnEscape:true,
-                    resizable:true,
-                    width:700,
-                    height:400,
-                    modal:true
-                });
-            }
-            that.deckListDialog.html("");
-            
-            function formatDeckName(formatName, deckName)
-            {
-                return "<b>[" + formatName + "]</b> - " + deckName;
-            }
-
-            var root = xml.documentElement;
-            if (root.tagName == "decks") {
-                var decks = root.getElementsByTagName("deck");
-                var deckNames = [];
-                for (var i = 0; i < decks.length; i++) {
-                    var deck = decks[i];
-                    var deckName = deck.childNodes[0].nodeValue;
-                    deckNames[i] = deckName;
-                    var formatName = deck.getAttribute("targetFormat");
-                    var openDeckBut = $("<button title='Open deck'><span class='ui-icon ui-icon-folder-open'></span></button>").button();
-                    var renameDeckBut = $("<button title='Rename deck'><span class='ui-icon ui-icon-pencil'></span></button>").button();
-                    var deckListBut = $("<button title='Share deck list'><span class='ui-icon ui-icon-extlink'></span></button>").button();
-                    var deleteDeckBut = $("<button title='Delete deck'><span class='ui-icon ui-icon-trash'></span></button>").button();
-
-                    var deckElem = $("<div class='deckItem'></div>");
-                    deckElem.append(openDeckBut);
-                    deckElem.append(renameDeckBut);
-                    deckElem.append(deckListBut);
-                    deckElem.append(deleteDeckBut);
-                    var deckNameDiv = $("<span/>").html(formatDeckName(formatName, deckName));
-                    deckElem.append(deckNameDiv);
-
-                    that.deckListDialog.append(deckElem);
-
-                    openDeckBut.click(
-                            (function (i) {
-                                return function () {
-                                    that.comm.getDeck(deckNames[i],
-                                            function (xml) {
-                                                that.setupDeck(xml, deckNames[i]);
-                                            });
-                                };
-                            })(i));
-
-
-                    deckListBut.click(
-                            (function (i) {
-                                return function () {
-                                    that.comm.shareDeck(deckNames[i],
-                                        function(html) {
-                                            window.open(html, "_blank");
-                                        });
-                                };
-                            })(i));
-                    
-                    renameDeckBut.click(
-                            (function (i, formatName, deckNameDiv) {
-                                return function () {
-                                    that.renameDeck(deckNames[i], function (newDeckName) {
-                                        deckNameDiv.html(formatDeckName(formatName, newDeckName));
-                                        
-                                        if (that.deckName == deckNames[i]) 
-                                        {
-                                            that.deckName = newDeckName;
-                                            that.deckModified(that.deckContentsDirty);
-                                        }
-                                        deckNames[i] = newDeckName;
-                                    })
-                                };
-                            })(i, formatName, deckNameDiv));
-
-                    deleteDeckBut.click(
-                            (function (i) {
-                                return function () {
-                                    if (confirm("Are you sure you want to delete this deck?")) {
-                                        that.comm.deleteDeck(deckNames[i],
-                                                function () {
-                                                    if (that.deckName == deckNames[i]) {
-                                                        that.deckName = null;
-                                                        $("#editingDeck").text("New deck");
-                                                        that.clearDeck();
-                                                    }
-
-                                                    that.loadDeckList();
-                                                });
-                                    }
-                                };
-                            })(i));
-                }
-            }
-
-            that.deckListDialog.dialog("open");
-        });
-    },
-    
-    loadLibraryList:function () {
-        var that = this;
-        this.comm.getLibraryDecks(function (xml) {
-            if (that.deckListDialog == null) {
-                that.deckListDialog = $("<div></div>")
-                        .dialog({
-                    title:"Library Decks",
-                    autoOpen:false,
-                    closeOnEscape:true,
-                    resizable:true,
-                    width:700,
-                    height:400,
-                    modal:true
-                });
-            }
-            that.deckListDialog.html("");
-            
-            function formatDeckName(formatName, deckName)
-            {
-                return "<b>[" + formatName + "]</b> - " + deckName;
-            }
-
-            var root = xml.documentElement;
-            if (root.tagName == "decks") {
-                var decks = root.getElementsByTagName("deck");
-                var deckNames = [];
-                for (var i = 0; i < decks.length; i++) {
-                    var deck = decks[i];
-                    var deckName = deck.childNodes[0].nodeValue;
-                    deckNames[i] = deckName;
-                    var formatName = deck.getAttribute("targetFormat");
-                    var openDeckBut = $("<button title='Open deck'><span class='ui-icon ui-icon-folder-open'></span></button>").button();
-                    var deckListBut = $("<button title='Deck list'><span class='ui-icon ui-icon-clipboard'></span></button>").button();
-
-                    var deckElem = $("<div class='deckItem'></div>");
-                    deckElem.append(openDeckBut);
-                    deckElem.append(deckListBut);
-                    var deckNameDiv = $("<span/>").html(formatDeckName(formatName, deckName));
-                    deckElem.append(deckNameDiv);
-
-                    that.deckListDialog.append(deckElem);
-
-                    openDeckBut.click(
-                            (function (i) {
-                                return function () {
-                                    that.comm.getLibraryDeck(deckNames[i],
-                                        function (xml) {
-                                            that.setupDeck(xml, deckNames[i]);
-                                            that.deckModified(true);
-                                        });
-                                };
-                            })(i));
-
-
-                    deckListBut.click(
-                            (function (i) {
-                                return function () {
-                                    window.open('/gemp-lotr-server/deck/libraryHtml?deckName=' + encodeURIComponent(deckNames[i]), "_blank");
-                                };
-                            })(i));
-                }
-            }
-
-            that.deckListDialog.dialog("open");
-        });
-    },
-
-    clickCardFunction:function (event) {
-        var that = this;
-
-        var tar = $(event.target);
-        if (tar.length == 1 && tar[0].tagName == "A")
-            return true;
-
-        if (!this.successfulDrag && this.cardInfoDialog.isOpen()) {
-            this.cardInfoDialog.mouseUp();
-            event.stopPropagation();
-            return false;
-        }
-
-        if (tar.hasClass("actionArea")) {
-            var selectedCardElem = tar.closest(".card");
-            if (event.which >= 1) {
-                if (!this.successfulDrag) {
-                    if (event.shiftKey || event.which > 1) {
-                        this.cardInfoDialog.showCard(selectedCardElem.data("card"));
-                        return false;
-                    } else if (selectedCardElem.hasClass("cardInCollection")) {
-                        var cardData = selectedCardElem.data("card");
-                        this.selectionFunc(cardData.blueprintId, cardData.zone);
-                        cardData.tokens = {count:(parseInt(cardData.tokens["count"]) - 1)};
-                        layoutTokens(selectedCardElem);
-                    } else if (selectedCardElem.hasClass("packInCollection")) {
-                        // if (confirm("Would you like to open this pack?")) {
-                            this.comm.openPack(this.getCollectionType(), selectedCardElem.data("card").blueprintId, function () {
-                                that.cardFilter.getCollection();
-                            }, {
-                                "404":function () {
-                                    alert("You have no pack of this type in your collection.");
-                                }
-                            });
-                        //}
-                    } else if (selectedCardElem.hasClass("cardToSelect")) {
-                        this.comm.openSelectionPack(this.getCollectionType(), this.packSelectionId, selectedCardElem.data("card").blueprintId, function () {
-                            that.cardFilter.getCollection();
-                        }, {
-                            "404":function () {
-                                alert("You have no pack of this type in your collection or that selection is not available for this pack.");
-                            }
-                        });
-                        this.selectionDialog.dialog("close");
-                    } else if (selectedCardElem.hasClass("selectionInCollection")) {
-                        var selectionDialogResize = function () {
-                            var width = that.selectionDialog.width() + 10;
-                            var height = that.selectionDialog.height() + 10;
-                            that.selectionGroup.setBounds(2, 2, width - 2 * 2, height - 2 * 2);
-                        };
-
-                        if (this.selectionDialog == null) {
-                            this.selectionDialog = $("<div></div>")
-                                    .dialog({
-                                title:"Choose one",
-                                autoOpen:false,
-                                closeOnEscape:true,
-                                resizable:true,
-                                width:400,
-                                height:200,
-                                modal:true
-                            });
-
-                            this.selectionGroup = new NormalCardGroup(this.selectionDialog, function (card) {
-                                return true;
-                            }, false);
-
-                            this.selectionDialog.bind("dialogresize", selectionDialogResize);
-                        }
-                        this.selectionDialog.html("");
-                        var cardData = selectedCardElem.data("card");
-                        this.packSelectionId = cardData.blueprintId;
-                        var selection = selectedCardElem.data("selection");
-                        var blueprintIds = selection.split("|");
-                        for (var i = 0; i < blueprintIds.length; i++) {
-                            var card = new Card(blueprintIds[i], null, null, "selection", "selection" + i, "player");
-                            var cardDiv = Card.CreateCardDiv(card.imageUrl, card.testingText, null, card.isFoil(), false, card.isPack(), card.hasErrata(), card.incomplete);
-                            cardDiv.data("card", card);
-                            cardDiv.addClass("cardToSelect");
-                            this.selectionDialog.append(cardDiv);
-                        }
-                        openSizeDialog(that.selectionDialog);
-                        selectionDialogResize();
-                    } else if (selectedCardElem.hasClass("cardInDeck")) {
-                        this.removeCardFromDeck(selectedCardElem);
-                    }
-                    event.stopPropagation();
-                }
-            }
-            return false;
-        }
-        return true;
-    },
-
-    dragCardData:null,
-    dragStartX:null,
-    dragStartY:null,
-    successfulDrag:null,
-
-    dragStartCardFunction:function (event) {
-        this.successfulDrag = false;
-        var tar = $(event.target);
-        if (tar.hasClass("actionArea")) {
-            var selectedCardElem = tar.closest(".card");
-            if (event.which == 1) {
-                this.dragCardData = selectedCardElem.data("card");
-                this.dragStartX = event.clientX;
-                this.dragStartY = event.clientY;
-                return false;
-            }
-        }
-        return true;
-    },
-
-    dragStopCardFunction:function (event) {
-        if (this.dragCardData != null) {
-            if (this.dragStartY - event.clientY >= 20) {
-                this.cardInfoDialog.showCard(this.dragCardData);
-                this.successfulDrag = true;
-            }
-            this.dragCardData = null;
-            this.dragStartX = null;
-            this.dragStartY = null;
-            return false;
-        }
-        return true;
-    },
-
-    getDeckContents:function () {
-        var ringBearer = $(".card", this.ringBearerDiv);
-        var ring = $(".card", this.ringDiv);
-
-        var result = "";
-        if (ringBearer.length > 0)
-            result += ringBearer.data("card").blueprintId;
-        result += "|";
-        if (ring.length > 0)
-            result += ring.data("card").blueprintId;
-        result += "|";
-
-        var sites = new Array();
-        $(".card", this.siteDiv).each(
-                function () {
-                    sites.push($(this).data("card").blueprintId);
-                });
-        result += sites;
-        result += "|";
-
-        var cards = new Array();
-        $(".card", this.drawDeckDiv).each(
-                function () {
-                    cards.push($(this).data("card").blueprintId);
-                });
-        result += cards;
-        
-        let formatCode = this.formatSelect.val();
-        if(formatCode == "pc_movie" || formatCode == "test_pc_movie") {
-            result += "|";
-            var map = $(".card", this.mapDiv);
-            if (map.length > 0)
-                result += map.data("card").blueprintId;
-        }
-        
-
-        return result;
-    },
-
-    saveDeck:function (reloadList) {
-        var that = this;
-
-        var deckContents = this.getDeckContents();
-        if (deckContents == null)
-            alert("Deck must contain at least Ring-bearer, The One Ring and 9 sites");
-        else
-            this.comm.saveDeck(this.deckName, that.formatSelect.val(), this.notes, deckContents, function (xml) {
-                that.deckModified(false);
-                alert("Deck was saved.  Refresh the Game Hall to see it!");
-            }, {
-                "400":function () {
-                    alert("Invalid deck format.");
-                }
-            });
-    },
-
-    addCardToContainer:function (blueprintId, zone, container, tokens) {
-        var card = new Card(blueprintId, null, null, zone, "deck", "player");
-        var cardDiv = Card.CreateCardDiv(card.imageUrl, card.testingText, null, card.isFoil(), tokens, card.isPack(), card.hasErrata(), card.incomplete);
-        cardDiv.data("card", card);
-        container.append(cardDiv);
-        return cardDiv;
-    },
-
-    showPredefinedFilter:function (filter, container) {
-        this.cardFilter.enableDetailFilters(false);
-        this.specialSelection = true;
-        this.cardFilter.setFilter(filter);
-
-        var that = this;
-        this.selectionFunc = function (blueprintId) {
-            var cardDiv = this.addCardToContainer(blueprintId, "special", container, false);
-            cardDiv.addClass("cardInDeck");
-            that.showNormalFilter();
-            that.layoutSpecialGroups();
-            that.deckModified(true);
-        };
-    },
-
-    showNormalFilter:function () {
-        this.cardFilter.enableDetailFilters(true);
-        this.specialSelection = false;
-        this.cardFilter.setFilter("");
-
-        this.selectionFunc = this.addCardToDeckAndLayout;
-    },
-
-    addCardToDeckDontLayout:function (blueprintId, side) {
-        var that = this;
-        if (side == "FREE_PEOPLE") {
-            this.addCardToDeck(blueprintId, side);
-        } else if (side == "SHADOW") {
-            this.addCardToDeck(blueprintId, side);
-        } else if (side == null) {
-            var div = this.addCardToContainer(blueprintId, side, this.siteDiv, false)
-            div.addClass("cardInDeck");
-        }
-    },
-
-    addCardToDeckAndLayout:function (blueprintId, side) {
-        var that = this;
-        if (side == "FREE_PEOPLE") {
-            this.addCardToDeck(blueprintId, side);
-            that.fpDeckGroup.layoutCards();
-        } else if (side == "SHADOW") {
-            this.addCardToDeck(blueprintId, side);
-            that.shadowDeckGroup.layoutCards();
-        } else if (side == null) {
-            var div = this.addCardToContainer(blueprintId, side, this.siteDiv, false)
-            div.addClass("cardInDeck");
-            that.siteGroup.layoutCards();
-        }
-        that.deckModified(true);
-    },
-
-    deckModified:function (value) {
-        
-        var name = (this.deckName == null) ? "New deck" : this.deckName;
-        if (value)
-        {
-            this.deckValidationDirty = true;
-            this.deckContentsDirty = true;
-            $("#editingDeck").html("<font color='orange'>*" + name + " - modified</font>");
-        }
-        else
-        {
-            this.deckContentsDirty = false;
-            $("#editingDeck").text(name);
-        }
-    },
-
-    addCardToDeck:function (blueprintId, side) {
-        var that = this;
-        var added = false;
-        $(".card.cardInDeck", this.drawDeckDiv).each(
-                function () {
-                    var cardData = $(this).data("card");
-                    if (cardData.blueprintId == blueprintId) {
-                        var attDiv = that.addCardToContainer(blueprintId, "attached", that.drawDeckDiv, false);
-                        cardData.attachedCards.push(attDiv);
-                        added = true;
-                    }
-                });
-        if (!added) {
-            var div = this.addCardToContainer(blueprintId, side, this.drawDeckDiv, false)
-            div.addClass("cardInDeck");
-        }
-
-        this.deckModified(true);
-    },
-
-    updateDeckStats:function () {
-        var that = this;
-        var deckContents = this.getDeckContents();
-        if (deckContents != null && deckContents != "") 
-        {
-            this.comm.getDeckStats(deckContents, 
-                   $("#formatSelect").val(),
-                    function (html) 
-                    {
-                        $("#deckStats").html(html);
-                    }, 
-                    {
-                        "400":function () 
-                        {
-                            alert("Invalid deck for getting stats.");
-                        }
-                    });
-        } else {
-            $("#deckStats").html("Deck has no Ring, Ring-bearer or all 9 sites");
-        }
-    },
-    
-    updateFormatOptions:function() {
-        var that = this;
-        var currentFormat = $("#formatSelect").val();
-        
-        this.comm.getFormats(false,
-            function (json) 
-            {
-                that.formatSelect.empty();
-                //var formats = JSON.parse(json);
-                $(json).each(function (index, o) {    
-                    var $option = $("<option/>")
-                        .attr("value", o.code)
-                        .text(o.name);
-                    that.formatSelect.append($option);
-                });
-                
-                that.formatSelect.val(currentFormat);
-
-            }, 
-            {
-                "400":function () 
-                {
-                    alert("Could not retrieve formats.");
-                }
-            });
-    },
-
-    removeCardFromDeck:function (cardDiv) {
-        var cardData = cardDiv.data("card");
-        if (cardData.attachedCards.length > 0) {
-            cardData.attachedCards[0].remove();
-            cardData.attachedCards.splice(0, 1);
-        } else {
-            cardDiv.remove();
-        }
-        var cardInCollectionElem = null;
-        $(".card", this.normalCollectionDiv).each(
-                function () {
-                    var tempCardData = $(this).data("card");
-                    if (tempCardData.blueprintId == cardData.blueprintId)
-                        cardInCollectionElem = $(this);
-                });
-        if (cardInCollectionElem != null) {
-            var cardInCollectionData = cardInCollectionElem.data("card");
-            cardInCollectionData.tokens = {count:(parseInt(cardInCollectionData.tokens["count"]) + 1)};
-            layoutTokens(cardInCollectionElem);
-        }
-
-        this.layoutDeck();
-        this.deckModified(true);
-    },
-
-    clearDeck:function () {
-        $(".cardInDeck").each(
-                function () {
-                    var cardData = $(this).data("card");
-                    for (var i = 0; i < cardData.attachedCards.length; i++)
-                        cardData.attachedCards[i].remove();
-                });
-        $(".cardInDeck").remove();
-
-        this.layoutUI(false);
-
-        this.deckValidationDirty = true;
-    },
-
-    setupDeck:function (xml, deckName) {
-        var root = xml.documentElement;
-        if (root.tagName == "deck") {
-            this.clearDeck();
-            this.deckName = deckName;
-            $("#editingDeck").text(deckName);
-            
-            var targetFormat = root.getElementsByTagName("targetFormat");
-            if (targetFormat.length > 0)
-            {
-                var formatName = targetFormat[0].getAttribute("formatName");
-                var formatCode = targetFormat[0].getAttribute("formatCode");
-                //$('#formatSelect option[value="' + formatName + '"]').prop('selected', true);
+	comm:null,
+
+	deckDiv:null,
+
+	manageDecksDiv:null,
+
+	ringBearerDiv:null,
+	ringBearerGroup:null,
+
+	ringDiv:null,
+	ringGroup:null,
+	
+	mapDiv:null,
+	mapGroup:null,
+	showMap:false,
+
+	siteDiv:null,
+	siteGroup:null,
+
+	collectionDiv:null,
+	formatSelect:null,
+	currentFormat:null,
+	notes:null,
+
+	normalCollectionDiv:null,
+	normalCollectionGroup:null,
+
+	selectionFunc:null,
+	drawDeckDiv:null,
+
+	fpDeckGroup:null,
+	shadowDeckGroup:null,
+
+	start:0,
+	count:18,
+	filter:null,
+
+	deckName:null,
+
+	filterDirty:false,
+	deckValidationDirty:true,
+	deckContentsDirty:true,
+
+	checkDirtyInterval:500,
+
+	deckListDialog:null,
+	selectionDialog:null,
+	selectionGroup:null,
+	packSelectionId:null,
+	deckImportDialog:null,
+	notesDialog:null,
+
+	cardFilter:null,
+
+	collectionType:null,
+
+	defaultSelection:"cardType:-THE_ONE_RING",
+	
+	autoZoom: null,
+	cardInfoDialog: null,
+	
+	formats: null,
+
+	init:function () {
+		var that = this;
+
+		this.comm = new GempLotrCommunication("/gemp-lotr-server", that.processError);
+
+		this.collectionType = "default";
+		
+		this.cardFilter = new CardFilter($("#collectionDiv"),
+				function (filter, start, count, callback) {
+					that.comm.getCollection(that.collectionType, filter, start, count, function (xml) {
+						callback(xml);
+					}, {
+						"404":function () {
+							alert("You don't have collection of that type.");
+						}
+					});
+				},
+				function () {
+					that.clearCollection();
+				},
+				function (elem, type, blueprintId, count) {
+					that.addCardToCollection(type, blueprintId, count, elem.getAttribute("side"), elem.getAttribute("contents"));
+				},
+				function () {
+					that.finishCollection();
+				});
+		
+		//this.cardFilter.setFilterOverride(this.defaultSelection);
+
+		this.deckDiv = $("#deckDiv");
+
+		this.manageDecksDiv = $("#manageDecks");
+		
+		this.formatSelect = $("#formatSelect");
+		$("#formatSelect").change(
+				function () {
+					that.deckModified(true);
+					let formatCode = that.formatSelect.val();
+					if(formatCode == "pc_movie" || formatCode == "test_pc_movie") {
+						that.setMapVisibility(true);
+					}
+					else {
+						that.setMapVisibility(false);
+					}
+					
+					that.cardFilter.updateFormat(formatCode, that.formats[formatCode].blockFilters);
+				});
+		
+		this.autoZoom = new AutoZoom("autoZoomInDeckbuilder");
+
+		var collectionSelect = $("#collectionSelect");
+
+		var newDeckBut = $("#newDeckBut").button();
+
+		var saveDeckBut = $("#saveDeckBut").button();
+
+		var renameDeckBut = $("#renameDeckBut").button();
+
+		var copyDeckBut = $("#copyDeckBut").button();
+		
+		var importDeckBut = $("#importDeckBut").button();
+		
+		var libraryListBut = $("#libraryListBut").button();
+
+		var deckListBut = $("#deckListBut").button();
+		
+		var notesBut = $("#notesBut").button();
+		
+		if(this.autoZoom.autoZoomToggle != null) {
+			this.autoZoom.autoZoomToggle.appendTo(this.manageDecksDiv);
+		}
+
+		this.deckNameSpan = ("#editingDeck");
+
+		newDeckBut.click(
+				function () {
+					that.deckName = null;
+					$("#editingDeck").text("New deck");
+					that.clearDeck();
+				});
+
+		saveDeckBut.click(
+				function () {
+					if (that.deckName == null) {
+						var newDeckName = prompt("Enter the name of the deck", "");
+						if (newDeckName == null)
+							return;
+						if (newDeckName.length < 3 || newDeckName.length > 100)
+							alert("Deck name has to have at least 3 characters and at most 100 characters.");
+						else {
+							that.deckName = newDeckName;
+							$("#editingDeck").text(newDeckName);
+							that.saveDeck(true);
+						}
+					} else {
+						that.saveDeck(false);
+					}
+				});
+
+		renameDeckBut.click(
+				function () {
+					if (that.deckName == null) {
+						alert("You can't rename this deck, since it's not named (saved) yet.");
+						return;
+					}
+					that.renameCurrentDeck();
+				});
+
+		copyDeckBut.click(
+				function () {
+					that.deckName = null;
+					$("#editingDeck").text("New deck");
+				});
+
+		deckListBut.click(
+				function () {
+					that.loadDeckList();
+				});
+		
+		libraryListBut.click(
+				function () {
+					that.loadLibraryList();
+				});
+
+		importDeckBut.click(
+				function () {
+					that.deckName = null;
+					that.importDecklist();
+				});
+		
+		notesBut.click(
+			   function () {
+					that.editNotes();
+			   });
+
+		this.collectionDiv = $("#collectionDiv");
+
+		$("#collectionSelect").change(
+				function () {
+					that.collectionType = that.getCollectionType();
+					that.cardFilter.getCollection();
+				});
+
+		this.normalCollectionDiv = $("#collection-display");
+		this.normalCollectionGroup = new NormalCardGroup(this.normalCollectionDiv, function (card) {
+			return true;
+		});
+		this.normalCollectionGroup.maxCardHeight = 200;
+
+		this.ringBearerDiv = $("#ringBearerDiv");
+		this.ringBearerDiv.click(
+				function () {
+					if ($(".card", that.ringBearerDiv).length == 0) {
+						that.showPredefinedFilter("canStartWithRing:true product:card", that.ringBearerDiv);
+					}
+				});
+		this.ringBearerGroup = new NormalCardGroup(this.ringBearerDiv, function (card) {
+			return true;
+		}, false, $("#rb-content"));
+
+		this.ringDiv = $("#ringDiv");
+		this.ringDiv.click(
+				function () {
+					if ($(".card", that.ringDiv).length == 0)
+						that.showPredefinedFilter("cardType:THE_ONE_RING product:card", that.ringDiv);
+				});
+		this.ringGroup = new NormalCardGroup(this.ringDiv, function (card) {
+			return true;
+		}, false, $("#ring-content"));
+		
+		this.mapDiv = $("#map-div");
+		this.mapDiv.click(
+				function () {
+					if ($(".card", that.mapDiv).length == 0)
+						that.showPredefinedFilter("cardType:MAP product:card", that.mapDiv);
+				});
+		this.mapGroup = new NormalCardGroup(this.mapDiv, function (card) {
+			return true;
+		}, false, $("#map-content"));
+
+		this.siteDiv = $("#sitesDiv");
+		this.siteDiv.click(
+				function () {
+					$("#cardTypeSelect").val('SITE').trigger('change');
+					$("#sortSelect").val('siteNumber,name').trigger('change');
+				});
+		this.siteGroup = new VerticalBarGroup(this.siteDiv, function (card) {
+			return true;
+		}, false, $("#sites-content"));
+
+		this.drawDeckDiv = $("#decksRegion");
+		this.fpDeckGroup = new NormalCardGroup(this.drawDeckDiv, function (card) {
+			return (card.zone == "FREE_PEOPLE");
+		});
+		this.fpDeckGroup.maxCardHeight = 200;
+		this.shadowDeckGroup = new NormalCardGroup(this.drawDeckDiv, function (card) {
+			return (card.zone == "SHADOW");
+		});
+		this.shadowDeckGroup.maxCardHeight = 200;
+
+		this.bottomBarDiv = $("#statsDiv");
+
+		this.selectionFunc = this.addCardToDeckAndLayout;
+
+		$("body").click(
+				function (event) {
+					return that.clickCardFunction(event);
+				});
+		$("body")[0].addEventListener("contextmenu",
+			function (event) {
+				if(!that.clickCardFunction(event))
+				{
+					event.preventDefault();
+					return false;
+				}
+				return true;
+			});
+		$('body').unbind('mouseover');
+		$("body").mouseover(
+			function (event) {
+				return that.autoZoom.handleMouseOver(event.originalEvent, 
+				   that.dragCardId != null, that.cardInfoDialog.isOpen());
+			});
+
+		$('body').unbind('mouseout');
+		$("body").mouseout(
+			function (event) {
+				return that.autoZoom.handleMouseOut(event.originalEvent);
+			});
+
+		$("body").mousedown(
+				function (event) {
+					that.autoZoom.handleMouseDown(event.originalEvent);
+					
+					return that.dragStartCardFunction(event);
+				});
+		$("body").mouseup(
+				function (event) {
+					return that.dragStopCardFunction(event);
+				});
+		
+		//If we ever add double-sided cards, this will be needed for
+		// the card hover.
+		
+		$('body').unbind('keydown');
+		$("body").keydown(
+			function (event) {
+				return that.autoZoom.handleKeyDown(event.originalEvent);
+			});
+
+		$('body').unbind('keyup');
+		$("body").keyup(
+			function (event) {
+				return that.autoZoom.handleKeyUp(event);
+			});
+
+		this.cardInfoDialog = new CardInfoDialog(window.innerWidth, window.innerHeight);
+
+		this.getCollectionTypes();
+
+		// this.cardFilter.setFilter("");
+		// this.cardFilter.getCollection();
+
+
+		setInterval(() => {
+			if (that.deckValidationDirty) {
+				that.deckValidationDirty = false;
+				that.updateDeckStats();
+			}
+		}, this.checkDirtyInterval);
+		
+		this.updateFormatOptions();
+	},
+	
+	setMapVisibility:function(value) {
+		this.showMap = value;
+		this.layoutUI(true);
+	},
+	
+	renameCurrentDeck:function() {
+		var that = this;
+		that.renameDeck(that.deckName, function (newDeckName) {
+			
+			if (that.deckContentsDirty && confirm("Do you wish to save this deck?"))
+			{
+				that.saveDeck(false);
+			}
+			that.deckName = newDeckName;
+			that.deckModified(that.deckContentsDirty);
+		});
+	},
+	
+	renameDeck:function(oldName, callback) {
+		var that = this;
+		
+		var newDeckName = prompt("Enter new name for the deck", oldName);
+		if (newDeckName == null)
+			return;
+		
+		if (newDeckName.length < 3 || newDeckName.length > 100)
+			alert("Deck name has to have at least 3 characters and at most 100 characters.");
+		else {
+			that.comm.renameDeck(oldName, newDeckName, () => callback(newDeckName), 
+				{
+					"404":function () {
+						alert("Couldn't find the deck to rename on the server.");
+					}
+				});
+		}
+	},
+
+	getCollectionType:function () {
+		return $("#collectionSelect option:selected").prop("value");
+	},
+
+	getCollectionTypes:function () {
+		var that = this;
+		this.comm.getCollectionTypes(
+				function (xml) {
+					var root = xml.documentElement;
+					if (root.tagName == "collections") {
+						var collections = root.getElementsByTagName("collection");
+						$("#formatSelect").append("<option disabled>---Limited---</option>");
+						for (var i = 0; i < collections.length; i++) {
+							var collection = collections[i];
+							$("#collectionSelect").append("<option value='" + collection.getAttribute("type") + "'>" + collection.getAttribute("name") + "</option>");
+							$("#formatSelect").append("<option value='" + collection.getAttribute("format") + "'>" + collection.getAttribute("name") + "</option>");
+						}
+					}
+				});
+	},
+	
+	importDecklist:function () {
+		var that = this;
+		if (that.deckImportDialog == null) {
+			that.deckImportDialog = $('<div></div>').dialog({
+				closeOnEscape:true,
+				resizable:true,
+				title:"Import deck"
+			});
+		}
+		that.deckImportDialog.html("");
+		var deckImport = $("<textarea rows='5' cols='30' id='deckImport' decklist='decklist'></textarea>");
+		var getDecklistTextBut = $("<button title='Import'>Import</button>").button();
+
+		var importDialogDiv = $("<div></div>");
+		importDialogDiv.append(deckImport);
+		importDialogDiv.append(getDecklistTextBut);
+		that.deckImportDialog.append(importDialogDiv);
+
+		getDecklistTextBut.click(
+			 function () {
+				var decklist = $('textarea[decklist="decklist"]').val()
+				that.parseDecklist(decklist);
+			}
+		);
+		that.deckImportDialog.dialog("open");
+	},
+	
+	parseDecklist:function(rawText) {
+		this.clearDeck();
+		var that = this;
+		var rawTextList = rawText.split("\n");
+		var formattedText = "";
+		for (var i = 0; i < rawTextList.length; i++) {
+			if (rawTextList[i] != "") {
+				var line = that.removeNotes(rawTextList[i]).toLowerCase();
+				line = line.replace(/[\*•]/g,"").replace(/’/g,"'")
+						.replace(/starting|start|map:|ring-bearer:|ring:/g,"")
+				formattedText = formattedText + line.trim() + "~";
+			}
+		}
+				
+		this.importDeckCollection(formattedText, function (xml) {
+			var cards = xml.documentElement.getElementsByTagName("card");
+			for (var i = 0; i < cards.length; i++) {
+				var cardElem = cards[i];
+				var blueprintId = cardElem.getAttribute("blueprintId");
+				var side = cardElem.getAttribute("side");
+				var group = cardElem.getAttribute("group");
+				var cardCount = parseInt(cardElem.getAttribute("count"));
+				for (var j = 0; j < cardCount; j++) {
+					if (group == "ringBearer") {
+						that.addCardToContainer(blueprintId, "special", that.ringBearerDiv, false).addClass("cardInDeck");
+					} else if (group == "ring") {
+						that.addCardToContainer(blueprintId, "special", that.ringDiv, false).addClass("cardInDeck");
+					} else if (group == "map") {
+						that.addCardToContainer(blueprintId, "special", that.mapDiv, false).addClass("cardInDeck");
+					} else {
+						that.addCardToDeckDontLayout(blueprintId, side);
+					}
+				}
+			}
+			that.deckModified(true);
+			that.layoutDeck();
+			$("#editingDeck").text("Imported Deck (unsaved)");
+		});
+	},
+
+	removeNotes:function(line) {
+		var processedLine = line;
+		var hasNotes = false;
+		var start = line.indexOf("(");
+		var end = line.indexOf(")", start);
+		if (start < 0 && end < 0) {
+			start = line.indexOf("[");
+			end = line.indexOf("]", start);
+		}
+		if (start > 0) {
+			processedLine = line.slice(0,start)
+			if (end > 0) {
+				processedLine = processedLine + line.slice(end+1);
+			}
+		}
+		else if (end > 0) {
+			processedLine = line.slice(end+1);
+		}
+		if (processedLine.indexOf("(") > -1 || processedLine.indexOf(")") > -1 ||
+			processedLine.indexOf("[") > -1 || processedLine.indexOf("]") > -1) {
+				return this.removeNotes(processedLine);
+			}
+		return processedLine;
+	},
+
+	importDeckCollection:function (decklist, callback) {
+		this.comm.importCollection(decklist, function (xml) {
+			callback(xml);
+		}, {
+			"414":function () {
+				alert("Deck too large to import.");
+			}
+		});
+	},
+	
+	editNotes:function() {
+		var that = this;
+		that.notesDialog = $('<div class="notesDialog"></div>')
+			.dialog({
+				title:"Edit Deck Notes",
+				autoOpen:false,
+				closeOnEscape:true,
+				resizable:true,
+				width:700,
+				height:400,
+				modal:true
+			});
+			
+		var notesElem = $("<textarea class='notesText'></textarea>");
+			
+		notesElem.val(that.notes);
+		that.notesDialog.append(notesElem);
+		
+		notesElem.change(function() {
+			that.notes = notesElem.val();
+			that.deckModified(true);
+		});
+		
+		that.notesDialog.dialog("open");
+	},
+
+	loadDeckList:function () {
+		var that = this;
+		this.comm.getDecks(function (xml) {
+			if (that.deckListDialog == null) {
+				that.deckListDialog = $("<div></div>")
+						.dialog({
+					title:"Your Saved Decks",
+					autoOpen:false,
+					closeOnEscape:true,
+					resizable:true,
+					width:700,
+					height:400,
+					modal:true
+				});
+			}
+			that.deckListDialog.html("");
+			
+			function formatDeckName(formatName, deckName)
+			{
+				return "<b>[" + formatName + "]</b> - " + deckName;
+			}
+
+			var root = xml.documentElement;
+			if (root.tagName == "decks") {
+				var decks = root.getElementsByTagName("deck");
+				var deckNames = [];
+				for (var i = 0; i < decks.length; i++) {
+					var deck = decks[i];
+					var deckName = deck.childNodes[0].nodeValue;
+					deckNames[i] = deckName;
+					var formatName = deck.getAttribute("targetFormat");
+					var openDeckBut = $("<button title='Open deck'><span class='ui-icon ui-icon-folder-open'></span></button>").button();
+					var renameDeckBut = $("<button title='Rename deck'><span class='ui-icon ui-icon-pencil'></span></button>").button();
+					var deckListBut = $("<button title='Share deck list'><span class='ui-icon ui-icon-extlink'></span></button>").button();
+					var deleteDeckBut = $("<button title='Delete deck'><span class='ui-icon ui-icon-trash'></span></button>").button();
+
+					var deckElem = $("<div class='deckItem'></div>");
+					deckElem.append(openDeckBut);
+					deckElem.append(renameDeckBut);
+					deckElem.append(deckListBut);
+					deckElem.append(deleteDeckBut);
+					var deckNameDiv = $("<span/>").html(formatDeckName(formatName, deckName));
+					deckElem.append(deckNameDiv);
+
+					that.deckListDialog.append(deckElem);
+
+					openDeckBut.click(
+							(function (i) {
+								return function () {
+									that.comm.getDeck(deckNames[i],
+											function (xml) {
+												that.setupDeck(xml, deckNames[i]);
+											});
+								};
+							})(i));
+
+
+					deckListBut.click(
+							(function (i) {
+								return function () {
+									that.comm.shareDeck(deckNames[i],
+										function(html) {
+											window.open(html, "_blank");
+										});
+								};
+							})(i));
+					
+					renameDeckBut.click(
+							(function (i, formatName, deckNameDiv) {
+								return function () {
+									that.renameDeck(deckNames[i], function (newDeckName) {
+										deckNameDiv.html(formatDeckName(formatName, newDeckName));
+										
+										if (that.deckName == deckNames[i]) 
+										{
+											that.deckName = newDeckName;
+											that.deckModified(that.deckContentsDirty);
+										}
+										deckNames[i] = newDeckName;
+									})
+								};
+							})(i, formatName, deckNameDiv));
+
+					deleteDeckBut.click(
+							(function (i) {
+								return function () {
+									if (confirm("Are you sure you want to delete this deck?")) {
+										that.comm.deleteDeck(deckNames[i],
+												function () {
+													if (that.deckName == deckNames[i]) {
+														that.deckName = null;
+														$("#editingDeck").text("New deck");
+														that.clearDeck();
+													}
+
+													that.loadDeckList();
+												});
+									}
+								};
+							})(i));
+				}
+			}
+
+			that.deckListDialog.dialog("open");
+		});
+	},
+	
+	loadLibraryList:function () {
+		var that = this;
+		this.comm.getLibraryDecks(function (xml) {
+			if (that.deckListDialog == null) {
+				that.deckListDialog = $("<div></div>")
+						.dialog({
+					title:"Library Decks",
+					autoOpen:false,
+					closeOnEscape:true,
+					resizable:true,
+					width:700,
+					height:400,
+					modal:true
+				});
+			}
+			that.deckListDialog.html("");
+			
+			function formatDeckName(formatName, deckName)
+			{
+				return "<b>[" + formatName + "]</b> - " + deckName;
+			}
+
+			var root = xml.documentElement;
+			if (root.tagName == "decks") {
+				var decks = root.getElementsByTagName("deck");
+				var deckNames = [];
+				for (var i = 0; i < decks.length; i++) {
+					var deck = decks[i];
+					var deckName = deck.childNodes[0].nodeValue;
+					deckNames[i] = deckName;
+					var formatName = deck.getAttribute("targetFormat");
+					var openDeckBut = $("<button title='Open deck'><span class='ui-icon ui-icon-folder-open'></span></button>").button();
+					var deckListBut = $("<button title='Deck list'><span class='ui-icon ui-icon-clipboard'></span></button>").button();
+
+					var deckElem = $("<div class='deckItem'></div>");
+					deckElem.append(openDeckBut);
+					deckElem.append(deckListBut);
+					var deckNameDiv = $("<span/>").html(formatDeckName(formatName, deckName));
+					deckElem.append(deckNameDiv);
+
+					that.deckListDialog.append(deckElem);
+
+					openDeckBut.click(
+							(function (i) {
+								return function () {
+									that.comm.getLibraryDeck(deckNames[i],
+										function (xml) {
+											that.setupDeck(xml, deckNames[i]);
+											that.deckModified(true);
+										});
+								};
+							})(i));
+
+
+					deckListBut.click(
+							(function (i) {
+								return function () {
+									window.open('/gemp-lotr-server/deck/libraryHtml?deckName=' + encodeURIComponent(deckNames[i]), "_blank");
+								};
+							})(i));
+				}
+			}
+
+			that.deckListDialog.dialog("open");
+		});
+	},
+
+	clickCardFunction:function (event) {
+		var that = this;
+
+		var tar = $(event.target);
+		if (tar.length == 1 && tar[0].tagName == "A")
+			return true;
+
+		if (!this.successfulDrag && this.cardInfoDialog.isOpen()) {
+			this.cardInfoDialog.mouseUp();
+			event.stopPropagation();
+			return false;
+		}
+
+		if (tar.hasClass("actionArea")) {
+			var selectedCardElem = tar.closest(".card");
+			if (event.which >= 1) {
+				if (!this.successfulDrag) {
+					if (event.shiftKey || event.which > 1) {
+						this.cardInfoDialog.showCard(selectedCardElem.data("card"));
+						return false;
+					} else if (selectedCardElem.hasClass("cardInCollection")) {
+						var cardData = selectedCardElem.data("card");
+						this.selectionFunc(cardData.blueprintId, cardData.zone);
+						cardData.tokens = {count:(parseInt(cardData.tokens["count"]) - 1)};
+						layoutTokens(selectedCardElem);
+					} else if (selectedCardElem.hasClass("packInCollection")) {
+						// if (confirm("Would you like to open this pack?")) {
+							this.comm.openPack(this.getCollectionType(), selectedCardElem.data("card").blueprintId, function () {
+								that.cardFilter.getCollection();
+							}, {
+								"404":function () {
+									alert("You have no pack of this type in your collection.");
+								}
+							});
+						//}
+					} else if (selectedCardElem.hasClass("cardToSelect")) {
+						this.comm.openSelectionPack(this.getCollectionType(), this.packSelectionId, selectedCardElem.data("card").blueprintId, function () {
+							that.cardFilter.getCollection();
+						}, {
+							"404":function () {
+								alert("You have no pack of this type in your collection or that selection is not available for this pack.");
+							}
+						});
+						this.selectionDialog.dialog("close");
+					} else if (selectedCardElem.hasClass("selectionInCollection")) {
+						var selectionDialogResize = function () {
+							var width = that.selectionDialog.width() + 10;
+							var height = that.selectionDialog.height() + 10;
+							that.selectionGroup.setBounds(2, 2, width - 2 * 2, height - 2 * 2);
+						};
+
+						if (this.selectionDialog == null) {
+							this.selectionDialog = $("<div></div>")
+									.dialog({
+								title:"Choose one",
+								autoOpen:false,
+								closeOnEscape:true,
+								resizable:true,
+								width:400,
+								height:200,
+								modal:true
+							});
+
+							this.selectionGroup = new NormalCardGroup(this.selectionDialog, function (card) {
+								return true;
+							}, false);
+
+							this.selectionDialog.bind("dialogresize", selectionDialogResize);
+						}
+						this.selectionDialog.html("");
+						var cardData = selectedCardElem.data("card");
+						this.packSelectionId = cardData.blueprintId;
+						var selection = selectedCardElem.data("selection");
+						var blueprintIds = selection.split("|");
+						for (var i = 0; i < blueprintIds.length; i++) {
+							var card = new Card(blueprintIds[i], null, null, "selection", "selection" + i, "player");
+							var cardDiv = Card.CreateCardDiv(card.imageUrl, card.testingText, null, card.isFoil(), false, card.isPack(), card.hasErrata(), card.incomplete);
+							cardDiv.data("card", card);
+							cardDiv.addClass("cardToSelect");
+							this.selectionDialog.append(cardDiv);
+						}
+						openSizeDialog(that.selectionDialog);
+						selectionDialogResize();
+					} else if (selectedCardElem.hasClass("cardInDeck")) {
+						this.removeCardFromDeck(selectedCardElem);
+					}
+					event.stopPropagation();
+				}
+			}
+			return false;
+		}
+		return true;
+	},
+
+	dragCardData:null,
+	dragStartX:null,
+	dragStartY:null,
+	successfulDrag:null,
+
+	dragStartCardFunction:function (event) {
+		this.successfulDrag = false;
+		var tar = $(event.target);
+		if (tar.hasClass("actionArea")) {
+			var selectedCardElem = tar.closest(".card");
+			if (event.which == 1) {
+				this.dragCardData = selectedCardElem.data("card");
+				this.dragStartX = event.clientX;
+				this.dragStartY = event.clientY;
+				return false;
+			}
+		}
+		return true;
+	},
+
+	dragStopCardFunction:function (event) {
+		if (this.dragCardData != null) {
+			if (this.dragStartY - event.clientY >= 20) {
+				this.cardInfoDialog.showCard(this.dragCardData);
+				this.successfulDrag = true;
+			}
+			this.dragCardData = null;
+			this.dragStartX = null;
+			this.dragStartY = null;
+			return false;
+		}
+		return true;
+	},
+
+	getDeckContents:function () {
+		var ringBearer = $(".card", this.ringBearerDiv);
+		var ring = $(".card", this.ringDiv);
+
+		var result = "";
+		if (ringBearer.length > 0)
+			result += ringBearer.data("card").blueprintId;
+		result += "|";
+		if (ring.length > 0)
+			result += ring.data("card").blueprintId;
+		result += "|";
+
+		var sites = new Array();
+		$(".card", this.siteDiv).each(
+				function () {
+					sites.push($(this).data("card").blueprintId);
+				});
+		result += sites;
+		result += "|";
+
+		var cards = new Array();
+		$(".card", this.drawDeckDiv).each(
+				function () {
+					cards.push($(this).data("card").blueprintId);
+				});
+		result += cards;
+		
+		let formatCode = this.formatSelect.val();
+		if(formatCode == "pc_movie" || formatCode == "test_pc_movie") {
+			result += "|";
+			var map = $(".card", this.mapDiv);
+			if (map.length > 0)
+				result += map.data("card").blueprintId;
+		}
+		
+
+		return result;
+	},
+
+	saveDeck:function (reloadList) {
+		var that = this;
+
+		var deckContents = this.getDeckContents();
+		if (deckContents == null)
+			alert("Deck must contain at least Ring-bearer, The One Ring and 9 sites");
+		else
+			this.comm.saveDeck(this.deckName, that.formatSelect.val(), this.notes, deckContents, function (xml) {
+				that.deckModified(false);
+				alert("Deck was saved.  Refresh the Game Hall to see it!");
+			}, {
+				"400":function () {
+					alert("Invalid deck format.");
+				}
+			});
+	},
+
+	addCardToContainer:function (blueprintId, zone, container, tokens) {
+		var card = new Card(blueprintId, null, null, zone, "deck", "player");
+		var cardDiv = Card.CreateCardDiv(card.imageUrl, card.testingText, null, card.isFoil(), tokens, card.isPack(), card.hasErrata(), card.incomplete);
+		cardDiv.data("card", card);
+		container.append(cardDiv);
+		return cardDiv;
+	},
+
+	showPredefinedFilter:function (filter, container) {
+		this.specialSelection = filter;
+		this.cardFilter.setFilterOverride(this.specialSelection);
+
+		var that = this;
+		this.selectionFunc = function (blueprintId) {
+			var cardDiv = this.addCardToContainer(blueprintId, "special", container, false);
+			cardDiv.addClass("cardInDeck");
+			that.showNormalFilter();
+			that.layoutSpecialGroups();
+			that.deckModified(true);
+		};
+	},
+
+	showNormalFilter:function () {
+		this.specialSelection = this.defaultSelection;
+		this.cardFilter.setFilterOverride(this.specialSelection);
+		this.selectionFunc = this.addCardToDeckAndLayout;
+	},
+
+	addCardToDeckDontLayout:function (blueprintId, side) {
+		var that = this;
+		if (side == "FREE_PEOPLE") {
+			this.addCardToDeck(blueprintId, side);
+		} else if (side == "SHADOW") {
+			this.addCardToDeck(blueprintId, side);
+		} else if (side == null) {
+			var div = this.addCardToContainer(blueprintId, side, this.siteDiv, false)
+			div.addClass("cardInDeck");
+		}
+	},
+
+	addCardToDeckAndLayout:function (blueprintId, side) {
+		var that = this;
+		if (side == "FREE_PEOPLE") {
+			this.addCardToDeck(blueprintId, side);
+			that.fpDeckGroup.layoutCards();
+		} else if (side == "SHADOW") {
+			this.addCardToDeck(blueprintId, side);
+			that.shadowDeckGroup.layoutCards();
+		} else if (side == null) {
+			var div = this.addCardToContainer(blueprintId, side, this.siteDiv, false)
+			div.addClass("cardInDeck");
+			that.siteGroup.layoutCards();
+		}
+		that.deckModified(true);
+	},
+
+	deckModified:function (value) {
+		
+		var name = (this.deckName == null) ? "New deck" : this.deckName;
+		if (value)
+		{
+			this.deckValidationDirty = true;
+			this.deckContentsDirty = true;
+			$("#editingDeck").html("<font color='orange'>*" + name + " - modified</font>");
+		}
+		else
+		{
+			this.deckContentsDirty = false;
+			$("#editingDeck").text(name);
+		}
+	},
+
+	addCardToDeck:function (blueprintId, side) {
+		var that = this;
+		var added = false;
+		$(".card.cardInDeck", this.drawDeckDiv).each(
+				function () {
+					var cardData = $(this).data("card");
+					if (cardData.blueprintId == blueprintId) {
+						var attDiv = that.addCardToContainer(blueprintId, "attached", that.drawDeckDiv, false);
+						cardData.attachedCards.push(attDiv);
+						added = true;
+					}
+				});
+		if (!added) {
+			var div = this.addCardToContainer(blueprintId, side, this.drawDeckDiv, false)
+			div.addClass("cardInDeck");
+		}
+
+		this.deckModified(true);
+	},
+
+	updateDeckStats:function () {
+		var that = this;
+		var deckContents = this.getDeckContents();
+		if (deckContents != null && deckContents != "") 
+		{
+			this.comm.getDeckStats(deckContents, 
+				  $("#formatSelect").val(),
+					function (html) 
+					{
+						$("#deckStats").html(html);
+					}, 
+					{
+						"400":function () 
+						{
+							alert("Invalid deck for getting stats.");
+						}
+					});
+		} else {
+			$("#deckStats").html("Deck has no Ring, Ring-bearer or all 9 sites");
+		}
+	},
+	
+	updateFormatOptions:function() {
+		var that = this;
+		var currentFormat = $("#formatSelect").val();
+		
+		this.comm.getFormats(false,
+			function (json) 
+			{
+				that.formatSelect.empty();
+				that.formats = json.Formats;
+				
+				let max = 0;
+				let options = {};
+				for (const [code, format] of Object.entries(that.formats)) {
+					if(!format.hall)
+						continue;
+					
+					var option = $("<option/>")
+						.attr("value", code)
+						.text(format.name);
+					options[format.order] = option;
+					if(format.order > max) {
+						max = format.order;
+					}
+				}
+				
+				for(let i = -1; i <= max; i++) {
+					if(Object.hasOwn(options, i)) {
+						that.formatSelect.append(options[i]);
+					}
+				}
+				
+				that.formatSelect.val(currentFormat);
+				that.formatSelect.change();
+				const sleep = ms => new Promise(r => setTimeout(r, ms));
+				that.showNormalFilter();
+
+			}, 
+			{
+				"400":function () 
+				{
+					alert("Could not retrieve formats.");
+				}
+			});
+	},
+
+	removeCardFromDeck:function (cardDiv) {
+		var cardData = cardDiv.data("card");
+		if (cardData.attachedCards.length > 0) {
+			cardData.attachedCards[0].remove();
+			cardData.attachedCards.splice(0, 1);
+		} else {
+			cardDiv.remove();
+		}
+		var cardInCollectionElem = null;
+		$(".card", this.normalCollectionDiv).each(
+				function () {
+					var tempCardData = $(this).data("card");
+					if (tempCardData.blueprintId == cardData.blueprintId)
+						cardInCollectionElem = $(this);
+				});
+		if (cardInCollectionElem != null) {
+			var cardInCollectionData = cardInCollectionElem.data("card");
+			cardInCollectionData.tokens = {count:(parseInt(cardInCollectionData.tokens["count"]) + 1)};
+			layoutTokens(cardInCollectionElem);
+		}
+
+		this.layoutDeck();
+		this.deckModified(true);
+	},
+
+	clearDeck:function () {
+		$(".cardInDeck").each(
+				function () {
+					var cardData = $(this).data("card");
+					for (var i = 0; i < cardData.attachedCards.length; i++)
+						cardData.attachedCards[i].remove();
+				});
+		$(".cardInDeck").remove();
+
+		this.layoutUI(false);
+
+		this.deckValidationDirty = true;
+	},
+
+	setupDeck:function (xml, deckName) {
+		var root = xml.documentElement;
+		if (root.tagName == "deck") {
+			this.clearDeck();
+			this.deckName = deckName;
+			$("#editingDeck").text(deckName);
+			
+			var targetFormat = root.getElementsByTagName("targetFormat");
+			if (targetFormat.length > 0)
+			{
+				var formatName = targetFormat[0].getAttribute("formatName");
+				var formatCode = targetFormat[0].getAttribute("formatCode");
+				//$('#formatSelect option[value="' + formatName + '"]').prop('selected', true);
  
-                this.formatSelect.val(formatCode);
-                this.formatSelect.change();
-            }
-            
-            var notes = root.getElementsByTagName("notes");
-            this.notes = notes[0].innerHTML;
+				this.formatSelect.val(formatCode);
+				this.formatSelect.change();
+			}
+			
+			var notes = root.getElementsByTagName("notes");
+			this.notes = notes[0].innerHTML;
 
-            var ringBearer = root.getElementsByTagName("ringBearer");
-            if (ringBearer.length > 0)
-                this.addCardToContainer(ringBearer[0].getAttribute("blueprintId"), "deck", this.ringBearerDiv, false).addClass("cardInDeck");
+			var ringBearer = root.getElementsByTagName("ringBearer");
+			if (ringBearer.length > 0)
+				this.addCardToContainer(ringBearer[0].getAttribute("blueprintId"), "deck", this.ringBearerDiv, false).addClass("cardInDeck");
 
-            var ring = root.getElementsByTagName("ring");
-            if (ring.length > 0)
-                this.addCardToContainer(ring[0].getAttribute("blueprintId"), "deck", this.ringDiv, false).addClass("cardInDeck");
+			var ring = root.getElementsByTagName("ring");
+			if (ring.length > 0)
+				this.addCardToContainer(ring[0].getAttribute("blueprintId"), "deck", this.ringDiv, false).addClass("cardInDeck");
 
-            var map = root.getElementsByTagName("map");
-            if (map.length > 0)
-                this.addCardToContainer(map[0].getAttribute("blueprintId"), "deck", this.mapDiv, false).addClass("cardInDeck");
+			var map = root.getElementsByTagName("map");
+			if (map.length > 0)
+				this.addCardToContainer(map[0].getAttribute("blueprintId"), "deck", this.mapDiv, false).addClass("cardInDeck");
 
-            var sites = root.getElementsByTagName("site");
-            for (var i = 0; i < sites.length; i++)
-                this.addCardToContainer(sites[i].getAttribute("blueprintId"), "deck", this.siteDiv, false).addClass("cardInDeck");
+			var sites = root.getElementsByTagName("site");
+			for (var i = 0; i < sites.length; i++)
+				this.addCardToContainer(sites[i].getAttribute("blueprintId"), "deck", this.siteDiv, false).addClass("cardInDeck");
 
-            var cards = root.getElementsByTagName("card");
-            for (var i = 0; i < cards.length; i++)
-                this.addCardToDeck(cards[i].getAttribute("blueprintId"), cards[i].getAttribute("side"));
+			var cards = root.getElementsByTagName("card");
+			for (var i = 0; i < cards.length; i++)
+				this.addCardToDeck(cards[i].getAttribute("blueprintId"), cards[i].getAttribute("side"));
 
-            this.layoutUI(false);
+			this.layoutUI(false);
 
-            this.cardFilter.getCollection();
-        }
-        this.deckModified(false);
-    },
+			this.cardFilter.getCollection();
+		}
+		this.deckModified(false);
+	},
 
-    clearCollection:function () {
-        $(".card", this.normalCollectionDiv).remove();
-    },
+	clearCollection:function () {
+		$(".card", this.normalCollectionDiv).remove();
+	},
 
-    addCardToCollection:function (type, blueprintId, count, side, contents) {
-        if (type == "pack") {
-            var card = new Card(blueprintId, null, null, "pack", "collection", "player");
-            card.tokens = {"count":count};
-            var cardDiv = Card.CreateCardDiv(card.imageUrl, null, null, false, false, true);
-            cardDiv.data("card", card);
-            
-            if (blueprintId.substr(0, 3) == "(S)") {
-                cardDiv.data("selection", contents);
-                cardDiv.addClass("selectionInCollection");
-            } else {
-                cardDiv.addClass("packInCollection");
-            }
-            this.normalCollectionDiv.append(cardDiv);
-        } else if (type == "card") {
-            var card = new Card(blueprintId, null, null, side, "collection", "player");
-            var countInDeck = 0;
-            $(".card", this.deckDiv).each(
-                    function () {
-                        var tempCardData = $(this).data("card");
-                        if (blueprintId == tempCardData.blueprintId)
-                            countInDeck++;
-                    });
-            card.tokens = {"count":count - countInDeck};
-            var cardDiv = Card.CreateCardDiv(card.imageUrl, card.testingText, null, card.isFoil(), true, card.isPack(), card.hasErrata(), card.incomplete);
-            cardDiv.data("card", card);
-            cardDiv.addClass("cardInCollection");
-            this.normalCollectionDiv.append(cardDiv);
-        }
-    },
+	addCardToCollection:function (type, blueprintId, count, side, contents) {
+		if (type == "pack") {
+			var card = new Card(blueprintId, null, null, "pack", "collection", "player");
+			card.tokens = {"count":count};
+			var cardDiv = Card.CreateCardDiv(card.imageUrl, null, null, false, false, true);
+			cardDiv.data("card", card);
+			
+			if (blueprintId.substr(0, 3) == "(S)") {
+				cardDiv.data("selection", contents);
+				cardDiv.addClass("selectionInCollection");
+			} else {
+				cardDiv.addClass("packInCollection");
+			}
+			this.normalCollectionDiv.append(cardDiv);
+		} else if (type == "card") {
+			var card = new Card(blueprintId, null, null, side, "collection", "player");
+			var countInDeck = 0;
+			$(".card", this.deckDiv).each(
+					function () {
+						var tempCardData = $(this).data("card");
+						if (blueprintId == tempCardData.blueprintId)
+							countInDeck++;
+					});
+			card.tokens = {"count":count - countInDeck};
+			var cardDiv = Card.CreateCardDiv(card.imageUrl, card.testingText, null, card.isFoil(), true, card.isPack(), card.hasErrata(), card.incomplete);
+			cardDiv.data("card", card);
+			cardDiv.addClass("cardInCollection");
+			this.normalCollectionDiv.append(cardDiv);
+		}
+	},
 
-    finishCollection:function () {
-        this.normalCollectionGroup.layoutCards();
-    },
+	finishCollection:function () {
+		this.normalCollectionGroup.layoutCards();
+	},
 
-    layoutUI:function (layoutDivs) {
-        if (layoutDivs) {
-            var manageHeight = 23;
+	layoutUI:function (layoutDivs) {
+		if (layoutDivs) {
+			var manageHeight = 23;
 
-            var padding = 5;
-            var collectionWidth = this.collectionDiv.width();
-            var collectionHeight = this.collectionDiv.height();
+			var padding = 5;
+			var collectionWidth = this.collectionDiv.width();
+			var collectionHeight = this.collectionDiv.height();
 
-            var deckWidth = this.deckDiv.width();
-            var deckHeight = this.deckDiv.height() - (manageHeight + padding);
+			var deckWidth = this.deckDiv.width();
+			var deckHeight = this.deckDiv.height() - (manageHeight + padding);
 
-            var rowHeight = Math.floor((deckHeight - 6 * padding) / 5);
-            var sitesWidth = Math.floor(1.5 * deckHeight / 5);
-            sitesWidth = Math.min(sitesWidth, 250);
+			var rowHeight = Math.floor((deckHeight - 6 * padding) / 5);
+			var sitesWidth = Math.floor(1.5 * deckHeight / 5);
+			sitesWidth = Math.min(sitesWidth, 250);
 
-            this.manageDecksDiv.css({position:"absolute", left:padding, top:padding, width:deckWidth, height:manageHeight});
+			this.manageDecksDiv.css({position:"absolute", left:padding, top:padding, width:deckWidth, height:manageHeight});
 
-            this.ringBearerDiv.css({ position:"absolute", left:padding, top:manageHeight + 2 * padding, width:Math.floor((sitesWidth - padding) / 2), height:rowHeight });
-            this.ringBearerGroup.setBounds(0, 0, Math.floor((sitesWidth - padding) / 2), rowHeight);
-            this.ringDiv.css({ display:"block", position:"absolute", left:Math.floor((sitesWidth + 3 * padding) / 2), top:manageHeight + 2 * padding, width:Math.floor((sitesWidth - padding) / 2), height:rowHeight });
-            this.ringGroup.setBounds(0, 0, Math.floor((sitesWidth - padding) / 2), rowHeight);
-            
-            if(this.showMap) {
-                this.mapDiv.css({ display:"block", position:"absolute", left:padding, top:manageHeight + 2 * padding+ rowHeight, width:Math.floor((sitesWidth - padding) / 2), height:rowHeight });
-                this.mapGroup.setBounds(0, 0, Math.floor((sitesWidth - padding) / 2), rowHeight);
+			this.ringBearerDiv.css({ position:"absolute", left:padding, top:manageHeight + 2 * padding, width:Math.floor((sitesWidth - padding) / 2), height:rowHeight });
+			this.ringBearerGroup.setBounds(0, 0, Math.floor((sitesWidth - padding) / 2), rowHeight);
+			this.ringDiv.css({ display:"block", position:"absolute", left:Math.floor((sitesWidth + 3 * padding) / 2), top:manageHeight + 2 * padding, width:Math.floor((sitesWidth - padding) / 2), height:rowHeight });
+			this.ringGroup.setBounds(0, 0, Math.floor((sitesWidth - padding) / 2), rowHeight);
+			
+			if(this.showMap) {
+				this.mapDiv.css({ display:"block", position:"absolute", left:padding, top:manageHeight + 2 * padding+ rowHeight, width:Math.floor((sitesWidth - padding) / 2), height:rowHeight });
+				this.mapGroup.setBounds(0, 0, Math.floor((sitesWidth - padding) / 2), rowHeight);
 
-                this.siteDiv.css({ position:"absolute", left:padding, top:manageHeight + 3 * padding + 2 * rowHeight, width:sitesWidth, height:deckHeight - 2*rowHeight - 2 * padding});
-                this.siteGroup.setBounds(0, 0, sitesWidth, deckHeight - 2*rowHeight - 2 * padding);
-            }
-            else {
-                this.mapDiv.css({ display:"none"});
-                this.mapGroup.setBounds(0, 0, Math.floor((sitesWidth - padding) / 2), rowHeight);
+				this.siteDiv.css({ position:"absolute", left:padding, top:manageHeight + 3 * padding + 2 * rowHeight, width:sitesWidth, height:deckHeight - 2*rowHeight - 2 * padding});
+				this.siteGroup.setBounds(0, 0, sitesWidth, deckHeight - 2*rowHeight - 2 * padding);
+			}
+			else {
+				this.mapDiv.css({ display:"none"});
+				this.mapGroup.setBounds(0, 0, Math.floor((sitesWidth - padding) / 2), rowHeight);
 
-                this.siteDiv.css({ position:"absolute", left:padding, top:manageHeight + 3 * padding + rowHeight, width:sitesWidth, height:deckHeight - rowHeight - 2 * padding});
-                this.siteGroup.setBounds(0, 0, sitesWidth, deckHeight - rowHeight - 2 * padding);
-            }
-            
-            this.drawDeckDiv.css({ position:"absolute", left:padding * 2 + sitesWidth, top:manageHeight + 2 * padding, width:deckWidth - (sitesWidth + padding) - padding, height:deckHeight - 2 * padding - 50 });
-            this.fpDeckGroup.setBounds(0, 0, deckWidth - (sitesWidth + padding) - padding, (deckHeight - 2 * padding - 50) / 2);
-            this.shadowDeckGroup.setBounds(0, (deckHeight - 2 * padding - 50) / 2, deckWidth - (sitesWidth + padding) - padding, (deckHeight - 2 * padding - 50) / 2);
+				this.siteDiv.css({ position:"absolute", left:padding, top:manageHeight + 3 * padding + rowHeight, width:sitesWidth, height:deckHeight - rowHeight - 2 * padding});
+				this.siteGroup.setBounds(0, 0, sitesWidth, deckHeight - rowHeight - 2 * padding);
+			}
+			
+			this.drawDeckDiv.css({ position:"absolute", left:padding * 2 + sitesWidth, top:manageHeight + 2 * padding, width:deckWidth - (sitesWidth + padding) - padding, height:deckHeight - 2 * padding - 50 });
+			this.fpDeckGroup.setBounds(0, 0, deckWidth - (sitesWidth + padding) - padding, (deckHeight - 2 * padding - 50) / 2);
+			this.shadowDeckGroup.setBounds(0, (deckHeight - 2 * padding - 50) / 2, deckWidth - (sitesWidth + padding) - padding, (deckHeight - 2 * padding - 50) / 2);
 
-            this.bottomBarDiv.css({ position:"absolute", left:padding * 2 + sitesWidth, top:manageHeight + padding + deckHeight - 50, width:deckWidth - (sitesWidth + padding) - padding, height:70 });
+			this.bottomBarDiv.css({ position:"absolute", left:padding * 2 + sitesWidth, top:manageHeight + padding + deckHeight - 50, width:deckWidth - (sitesWidth + padding) - padding, height:70 });
 
-            this.cardFilter.layoutUi(padding, 0, collectionWidth - padding, 160);
-            //this.normalCollectionDiv.css({ position:"absolute", left:padding, top:160, width:collectionWidth - padding * 2, height:collectionHeight - 160 });
+			this.cardFilter.layoutUi(padding, 0, collectionWidth - padding, 160);
+			//this.normalCollectionDiv.css({ position:"absolute", left:padding, top:160, width:collectionWidth - padding * 2, height:collectionHeight - 160 });
 
-            this.normalCollectionGroup.setBounds(0, 0, collectionWidth - padding * 2, collectionHeight - 400);
-        } else {
-            this.layoutDeck();
-            this.normalCollectionGroup.layoutCards();
-        }
-    },
+			this.normalCollectionGroup.setBounds(0, 0, collectionWidth - padding * 2, collectionHeight - 400);
+		} else {
+			this.layoutDeck();
+			this.normalCollectionGroup.layoutCards();
+		}
+	},
 
-    layoutSpecialGroups:function () {
-        this.ringBearerGroup.layoutCards();
-        this.ringGroup.layoutCards();
-        this.siteGroup.layoutCards();
-        if(this.showMap) {
-            this.mapGroup.layoutCards();
-        }
-    },
+	layoutSpecialGroups:function () {
+		this.ringBearerGroup.layoutCards();
+		this.ringGroup.layoutCards();
+		this.siteGroup.layoutCards();
+		if(this.showMap) {
+			this.mapGroup.layoutCards();
+		}
+	},
 
-    layoutDeck:function () {
-        this.layoutSpecialGroups();
-        this.fpDeckGroup.layoutCards();
-        this.shadowDeckGroup.layoutCards();
-    },
+	layoutDeck:function () {
+		this.layoutSpecialGroups();
+		this.fpDeckGroup.layoutCards();
+		this.shadowDeckGroup.layoutCards();
+	},
 
-    processError:function (xhr, ajaxOptions, thrownError) {
-        if (thrownError != "abort")
-        {
-            alert("There was a problem during communication with server");
-            console.log(xhr)
-            console.log(ajaxOptions)
-            console.log(thrownError)
-        }
-    }
+	processError:function (xhr, ajaxOptions, thrownError) {
+		if (thrownError != "abort")
+		{
+			alert("There was a problem during communication with server");
+			console.log(xhr)
+			console.log(ajaxOptions)
+			console.log(thrownError)
+		}
+	}
 });
diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/lotrFormats.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/lotrFormats.hjson
index 0e54fd9f3..795c29c51 100644
--- a/gemp-lotr/gemp-lotr-cards/src/main/resources/lotrFormats.hjson
+++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/lotrFormats.hjson
@@ -4,20 +4,53 @@
 		code: debug
 		sites: MULTIPATH
 		maximumSameName: 100
-		set: [
-			0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 101, 151
+		minDeckSize: 1
+		blocks: [
+			fotr_block
+		]
+		sets: [
+			0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19,
+			30, 31, 32, 33
 			51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69
-			70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 200
+			100, 101, 102
 		]
 		hall: false
 	}
+	{
+		name: Anything Goes
+		code: rev_tow_sta
+		order: -1
+		sites: MULTIPATH
+		cancelRingBearerSkirmish: true
+		sets: [
+			0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19
+			30, 31, 32, 33
+			50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69
+			100, 101, 102
+		]
+		blocks: [
+			Promotional|Promotional:0
+			fotr_block
+			ttt_block
+			king_block
+			war_block
+			hunter_block
+			Additional Sets|Reflections:9,Expanded Middle-earth:14,The Wraith Collection:16,Age's End:19
+			Player's Council V-sets|V0 - PC Kitchen Sink:100,V1 - Shadow of the Past:101,V2 - King of the Golden Hall:102
+			Player's Council Errata|Promotional Errata:50,The Fellowship of the Ring Errata:51,Mines of Moria Errata:52,Realms of the Elf-lords Errata:53,The Two Towers Errata:54,Battle of Helm's Deep Errata:55,Ents of Fangorn Errata:56,Return of the King Errata:57,Siege of Gondor Errata:58,Reflections Errata:59,Mount Doom Errata:60,Shadows Errata:61,Black Rider Errata:62,Bloodlines Errata:63,Expanded Middle-earth Errata:64,The Hunters Errata:65,The Wraith Collection Errata:66,Rise of Saruman Errata:67,Treachery & Deceit Errata:68,Age's End Errata:69
+			hobbit
+		]
+	}
 	{
 		name: Fellowship Block
 		code: fotr_block
 		order: 1
 		sites: FELLOWSHIP
 		cancelRingBearerSkirmish: true
-		set: [
+		blocks: [
+			fotr_block
+		]
+		sets: [
 			1, 2, 3
 		]
 	}
@@ -29,7 +62,12 @@
 		cancelRingBearerSkirmish: true
 		winAtEndOfRegroup: true
 		discardPileIsPublic: true
-		set: [
+		blocks: [
+			fotr_block
+			Player's Council V-sets|V1 - Shadow of the Past:101
+			Player's Council Errata|The Fellowship of the Ring Errata:51,Mines of Moria Errata:52,Realms of the Elf-lords Errata:53
+		]
+		sets: [
 			1, 2, 3, 101
 		]
 		errataSets: [
@@ -45,7 +83,13 @@
 			"8_1", "3_38", "3_106", "1_40", "2_32", "1_248", "3_108", "1_45", "7_96", "3_42", 
 			"10_2", "10_91", "1_108", "1_80", "3_67", "1_195", "3_68", "1_139", "7_49", "1_313", "1_234"
 		]
-		set: [
+		blocks: [
+			fotr_block
+			ttt_block
+			king_block
+			Additional Sets|Reflections:9
+		]
+		sets: [
 			1, 2, 3, 4, 5, 6, 7, 8, 9, 10
 		]
 	}
@@ -57,11 +101,16 @@
 		usesMaps: true
 		winAtEndOfRegroup: true
 		discardPileIsPublic: true
-		set: [
+		sets: [
 			1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 100, 101, 102
 		]
-		banned: [
-			"100_1"
+		blocks: [
+			Fellowship Block|The Fellowship of the Ring:1,Mines of Moria:2,Realms of the Elf-lords:3,V1 - Shadow of the Past:101
+			Towers Block|The Two Towers:4,Battle of Helm's Deep:5,Ents of Fangorn:6,V2 - King of the Golden Hall:102
+			king_block
+			Additional Sets|Reflections:9
+			Player's Council V-sets|V1 - Shadow of the Past:101,V2 - King of the Golden Hall:102
+			Player's Council Errata|The Fellowship of the Ring Errata:51,Mines of Moria Errata:52,Realms of the Elf-lords Errata:53,The Two Towers Errata:54,Battle of Helm's Deep Errata:55,Ents of Fangorn Errata:56,Return of the King Errata:57,Siege of Gondor Errata:58,Reflections Errata:59,Mount Doom Errata:60
 		]
 		errataSets: [
 			51,52,53,54,55,56,57,58,59,60
@@ -80,9 +129,18 @@
 		restricted: [
 			"1_40", "1_80", "1_108", "1_139", "1_195", "1_248", "2_32", "2_75", "3_106", "4_276", "4_304"
 		]
-		set: [
+		sets: [
 			0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19
 		]
+		blocks: [
+			Promotional|Promotional:0
+			fotr_block
+			ttt_block
+			king_block
+			war_block
+			hunter_block
+			Additional Sets|Reflections:9,Expanded Middle-earth:14,The Wraith Collection:16,Age's End:19
+		]
 	}
 	{
 		name: Expanded (PC)
@@ -91,9 +149,20 @@
 		sites: SHADOWS
 		winAtEndOfRegroup: true
 		discardPileIsPublic: true
-		set: [
+		sets: [
 			0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 100, 101, 102
 		]
+		blocks: [
+			Promotional|Promotional:0
+			fotr_block
+			ttt_block
+			king_block
+			war_block
+			hunter_block
+			Additional Sets|Reflections:9,Expanded Middle-earth:14,The Wraith Collection:16,Age's End:19
+			Player's Council V-sets|V0 - PC Kitchen Sink:100,V1 - Shadow of the Past:101,V2 - King of the Golden Hall:102
+			Player's Council Errata|Promotional Errata:50,The Fellowship of the Ring Errata:51,Mines of Moria Errata:52,Realms of the Elf-lords Errata:53,The Two Towers Errata:54,Battle of Helm's Deep Errata:55,Ents of Fangorn Errata:56,Return of the King Errata:57,Siege of Gondor Errata:58,Reflections Errata:59,Mount Doom Errata:60,Shadows Errata:61,Black Rider Errata:62,Bloodlines Errata:63,Expanded Middle-earth Errata:64,The Hunters Errata:65,The Wraith Collection Errata:66,Rise of Saruman Errata:67,Treachery & Deceit Errata:68,Age's End Errata:69
+		]
 		errataSets: [
 			51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69
 		]
@@ -104,9 +173,12 @@
 		order: 7
 		sites: FELLOWSHIP
 		cancelRingBearerSkirmish: true
-		set: [
+		sets: [
 			1
 		]
+		block: [
+			Fellowship Block|The Fellowship of the Ring:1
+		]
 		hall: false
 	}
 	{
@@ -115,9 +187,12 @@
 		order: 8
 		sites: FELLOWSHIP
 		cancelRingBearerSkirmish: true
-		set: [
+		sets: [
 			1, 2
 		]
+		block: [
+			Fellowship Block|The Fellowship of the Ring:1,Mines of Moria:2
+		]
 		hall: false
 	}
 	{
@@ -126,9 +201,12 @@
 		order: 9
 		sites: TWO_TOWERS
 		cancelRingBearerSkirmish: true
-		set: [
+		sets: [
 			4, 5, 6
 		]
+		blocks: [
+			ttt_block
+		]
 	}
 	{
 		name: Towers Open - Sets 1-4
@@ -136,9 +214,13 @@
 		order: 10
 		sites: TWO_TOWERS
 		cancelRingBearerSkirmish: true
-		set: [
+		sets: [
 			1, 2, 3, 4
 		]
+		blocks: [
+			fotr_block
+			Towers Block|The Two Towers:4
+		]
 		hall: false
 	}
 	{
@@ -147,9 +229,12 @@
 		order: 11
 		sites: TWO_TOWERS
 		cancelRingBearerSkirmish: true
-		set: [
+		sets: [
 			4
 		]
+		blocks: [
+			Towers Block|The Two Towers:4
+		]
 		hall: false
 	}
 	{
@@ -158,9 +243,12 @@
 		order: 12
 		sites: TWO_TOWERS
 		cancelRingBearerSkirmish: true
-		set: [
+		sets: [
 			4, 5
 		]
+		blocks: [
+			Towers Block|The Two Towers:4,Battle of Helm's Deep:5
+		]
 		hall: false
 	}
 	
@@ -174,9 +262,13 @@
 			"1_40", "1_45", "1_80", "1_108", "1_139", "1_234", "1_248", "1_313", "2_32", 
 			"2_101", "2_108", "3_38", "3_42", "3_68", "4_192"
 		]
-		set: [
+		sets: [
 			1, 2, 3, 4, 5, 6
 		]
+		blocks: [
+			fotr_block
+			ttt_block
+		]
 	}
 	{
 		name: Towers Standard - Sets 1-4
@@ -188,9 +280,13 @@
 			"1_40", "1_45", "1_80", "1_108", "1_139", "1_234", "1_248", "1_313", "2_32", 
 			"2_101", "2_108", "3_38", "3_42", "3_68", "4_192"
 		]
-		set: [
+		sets: [
 			1, 2, 3, 4
 		]
+		blocks: [
+			fotr_block
+			Towers Block|The Two Towers:4
+		]
 		hall: false
 	}
 	{
@@ -203,9 +299,13 @@
 			"1_40", "1_45", "1_80", "1_108", "1_139", "1_234", "1_248", "1_313", "2_32", 
 			"2_101", "2_108", "3_38", "3_42", "3_68", "4_192"
 		]
-		set: [
+		sets: [
 			1, 2, 3, 4, 5
 		]
+		blocks: [
+			fotr_block
+			Towers Block|The Two Towers:4,Battle of Helm's Deep:5
+		]
 		hall: false
 	}
 	{
@@ -218,9 +318,13 @@
 			"1_40", "1_45", "1_80", "1_108", "1_139", "1_234", "1_248", "1_313", "2_32", 
 			"2_101", "2_108", "3_38", "3_42", "3_68", "4_192"
 		]
-		set: [
+		sets: [
 			2, 3, 4, 5, 6
 		]
+		blocks: [
+			fotr_block
+			ttt_block
+		]
 		hall: false
 	}
 	{
@@ -233,9 +337,14 @@
 			"1_40", "1_45", "1_80", "1_108", "1_139", "1_234", "1_248", "1_313", "2_32", 
 			"2_101", "2_108", "3_38", "3_42", "3_68", "4_192"
 		]
-		set: [
+		sets: [
 			1, 2, 3, 4, 5, 6, 9, 14, 16
 		]
+		blocks: [
+			fotr_block
+			ttt_block
+			Additional Sets|Reflections:9,Expanded Middle-earth:14,The Wraith Collection:16
+		]
 		hall: true
 	}
 	{
@@ -247,9 +356,12 @@
 		restricted: [
 			"7_49"
 		]
-		set: [
+		sets: [
 			7, 8, 10
 		]
+		blocks: [
+			king_block
+		]
 	}
 	{
 		name: King Block - Set 7
@@ -260,9 +372,12 @@
 		restricted: [
 			"7_49"
 		]
-		set: [
+		sets: [
 			7
 		]
+		block: [
+			King Block|The Return of the King:7
+		]
 		hall: false
 	}
 	{
@@ -274,9 +389,12 @@
 		restricted: [
 			"7_49"
 		]
-		set: [
+		sets: [
 			7, 8
 		]
+		block: [
+			King Block|The Return of the King:7,Siege of Gondor:8
+		]
 		hall: false
 	}
 	{
@@ -289,9 +407,14 @@
 			"1_40", "1_45","1_80", "1_108", "1_139", "1_195", "1_234", "1_248", "1_313", 
 			"2_32", "2_101", "2_108", "3_38", "3_42", "3_67", "3_68", "3_106", "3_108"
 		]
-		set: [
+		sets: [
 			1, 2, 3, 4, 5, 6, 7
 		]
+		blocks: [
+			fotr_block
+			ttt_block
+			King Block|The Return of the King:7
+		]
 	}
 	{
 		name: Movie Block - Sets 1-7
@@ -303,9 +426,14 @@
 			"3_42", "10_2", "10_91", "1_108", "1_80", "3_67", "1_195", "3_68", "1_139", 
 			"7_49", "1_313", "1_234"
 		]
-		set: [
+		sets: [
 			1, 2, 3, 4, 5, 6, 7
 		]
+		blocks: [
+			fotr_block
+			ttt_block
+			King Block|The Return of the King:7
+		]
 		hall: false
 	}
 	{
@@ -318,9 +446,14 @@
 			"3_42", "10_2", "10_91", "1_108", "1_80", "3_67", "1_195", "3_68", "1_139", 
 			"7_49", "1_313", "1_234"
 		]
-		set: [
+		sets: [
 			1, 2, 3, 4, 5, 6, 7, 8
 		]
+		blocks: [
+			fotr_block
+			ttt_block
+			King Block|The Return of the King:7,Siege of Gondor:8
+		]
 		hall: false
 	}
 	{
@@ -333,9 +466,15 @@
 			"3_42", "10_2", "10_91", "1_108", "1_80", "3_67", "1_195", "3_68", "1_139", 
 			"7_49", "1_313", "1_234"
 		]
-		set: [
+		sets: [
 			1, 2, 3, 4, 5, 6, 7, 8, 9
 		]
+		blocks: [
+			fotr_block
+			ttt_block
+			King Block|The Return of the King:7,Siege of Gondor:8
+			Additional Sets|Reflections:9
+		]
 		hall: false
 	}
 	{
@@ -348,9 +487,14 @@
 			"3_42", "10_2", "10_91", "1_108", "1_80", "3_67", "1_195", "3_68", "1_139", 
 			"7_49", "1_313", "1_234"
 		]
-		set: [
+		sets: [
 			1, 2, 3, 4, 5, 6, 7, 8, 10
 		]
+		blocks: [
+			fotr_block
+			ttt_block
+			king_block
+		]
 		hall: false
 	}
 	{
@@ -363,9 +507,15 @@
 			"7_96", "3_42", "10_2", "10_91", "1_108", "1_80", "3_67", "1_195", "3_68", 
 			"1_139", "7_49", "1_313", "1_234"
 		]
-		set: [
+		sets: [
 			1, 2, 3, 4, 5, 6, 7, 8, 9, 10
 		]
+		blocks: [
+			fotr_block
+			ttt_block
+			king_block
+			Additional Sets|Reflections:9
+		]
 		hall: false
 	}
 	{
@@ -383,9 +533,15 @@
 		valid: [
 			"0_56-60"
 		]
-		set: [
+		sets: [
 			1, 2, 3, 4, 5, 6, 7, 8, 9, 10
 		]
+		blocks: [
+			fotr_block
+			ttt_block
+			king_block
+			Additional Sets|Reflections:9
+		]
 	}
 	{
 		name: War of the Ring Block
@@ -395,9 +551,12 @@
 		restricted: [
 			"11_132", "11_100"
 		]
-		set: [
+		sets: [
 			11, 12, 13
 		]
+		blocks: [
+			war_block
+		]
 	}
 	{
 		name: War of the Ring Block - Set 11
@@ -407,9 +566,12 @@
 		restricted: [
 			"11_132", "11_100"
 		]
-		set: [
+		sets: [
 			11
 		]
+		blocks: [
+			war_block
+		]
 		hall: false
 	}
 	{
@@ -420,9 +582,12 @@
 		restricted: [
 			"11_132", "11_100"
 		]
-		set: [
+		sets: [
 			11, 12
 		]
+		blocks: [
+			war_block
+		]
 		hall: false
 	}
 	{
@@ -433,9 +598,14 @@
 		restricted: [
 			"11_132", "11_100"
 		]
-		set: [
+		sets: [
 			10, 11, 12, 13, 14
 		]
+		blocks: [
+			King Block|Mount Doom:10
+			war_block
+			Additional Sets|Expanded Middle-earth:14
+		]
 		hall: false
 	}
 	{
@@ -450,18 +620,27 @@
 		valid: [
 			"0_56-60"
 		]
-		set: [
+		sets: [
 			4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14
 		]
+		blocks: [
+			ttt_block
+			king_block
+			war_block
+			Additional Sets|Reflections:9,Expanded Middle-earth:14
+		]
 	}
 	{
 		name: Hunters Block
 		code: hunter_block
 		order: 33
 		sites: SHADOWS
-		set: [
+		sets: [
 			15, 17, 18
 		]
+		blocks: [
+			hunter_block
+		]
 	}
 	{
 		name: Pre-Hunters Expanded
@@ -477,9 +656,17 @@
 			"1_40", "1_80", "1_108", "1_139", "1_195", "1_248", "2_32", "2_75", "3_106", 
 			"4_276", "4_304"
 		]
-		set: [
+		sets: [
 			0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14
 		]
+		blocks: [
+			Promotional|Promotional:0
+			fotr_block
+			ttt_block
+			king_block
+			war_block
+			Additional Sets|Reflections:9,Expanded Middle-earth:14
+		]
 	}
 	{
 		name: Standard
@@ -490,9 +677,16 @@
 			"0_1-19", "0_21", "0_22", "0_30-47", "0_62-67", "8_1", "13_188", "11_114", "11_31", 
 			"10_11", "15_64", "10_2", "10_91", "11_132", "7_49", "11_100"
 		]
-		set: [
+		sets: [
 			0, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19
 		]
+		blocks: [
+			Promotional|Promotional:0
+			king_block
+			war_block
+			hunter_block
+			Additional Sets|Reflections:9,Expanded Middle-earth:14,The Wraith Collection:16,Age's End:19
+		]
 	}
 	{
 		name: Open
@@ -502,22 +696,17 @@
 		restricted: [
 			"1_248", "7_49", "10_2", "10_91", "11_100", "11_132"
 		]
-		set: [
+		sets: [
 			0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19
 		]
-	}
-	{
-		name: Anything Goes
-		code: rev_tow_sta
-		order: 37
-		sites: MULTIPATH
-		cancelRingBearerSkirmish: true
-		set: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19
-			30, 31, 32, 33
-			50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69
-			70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89
-			101, 102, 103
-			151, 152, 153
+		blocks: [
+			Promotional|Promotional:0
+			fotr_block
+			ttt_block
+			king_block
+			war_block
+			hunter_block
+			Additional Sets|Reflections:9,Expanded Middle-earth:14,The Wraith Collection:16,Age's End:19
 		]
 	}
 	{
@@ -532,9 +721,16 @@
 			"11_132", "11_222", "11_226", "11_231", "11_232", "13_11", "13_37", "13_64", 
 			"13_188", "14_6"
 		]
-		set: [
+		sets: [
 			0, 1, 2, 3, 4, 5, 6, 9, 11, 12, 13, 14
 		]
+		blocks: [
+			Promotional|Promotional:0
+			fotr_block
+			ttt_block
+			war_block
+			Additional Sets|Reflections:9,Expanded Middle-earth:14,The Wraith Collection:16
+		]
 	}
 	{
 		name: Second Edition
@@ -550,7 +746,7 @@
 		valid: [
 			
 		]
-		set: [
+		sets: [
 			40
 		]
 		cancelRingBearerSkirmish: true
@@ -569,9 +765,12 @@
 			"30_2", "30_5", "30_6", "30_7", "30_8", "30_9", "30_10", "30_11", "30_12", 
 			"30_15", "30_16", "30_17", "30_18", "30_19", "30_29", "30_47", "30_48", "30_58"
 		]
-		set: [
+		sets: [
 			30, 31, 32, 33
 		]
+		blocks: [
+			hobbit
+		]
 		restrictedName: [
 			"Gandalf", Bilbo
 		]
@@ -585,9 +784,9 @@
 		cancelRingBearerSkirmish: true
 		winAtEndOfRegroup: true
 		discardPileIsPublic: true
-		hall: true
+		hall: false
 		playtest: true
-		set: [
+		sets: [
 			1, 2, 3, 101, 151
 		]
 		errataSets: [
@@ -603,9 +802,9 @@
 		winAtEndOfRegroup: true
 		discardPileIsPublic: true
 		usesMaps: true
-		hall: true
+		hall: false
 		playtest: true
-		set: [
+		sets: [
 			1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 101, 151
 		]
 		errataSets: [
@@ -620,9 +819,9 @@
 		order: 43
 		winAtEndOfRegroup: true
 		discardPileIsPublic: true
-		hall: true
+		hall: false
 		playtest: true
-		set: [
+		sets: [
 			0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 100, 101, 151
 		]
 		errataSets: [
@@ -646,9 +845,12 @@
 			"2_100", "2_105", "2_108", "2_109", "2_112", "2_113", "3_1", "3_3", "3_8", "3_13", "3_15", "3_17", "3_19", "3_21", "3_23", "3_27", "3_29", "3_34", "3_38", "3_39", "3_40", "3_41", "3_42"
 			"3_44", "3_50", "3_52", "3_54", "3_64", "3_65", "3_66", "3_67", "3_68", "3_71", "3_77", "3_80", "3_81", "3_85", "3_91", "3_93", "3_99", "3_102", "3_103", "3_104", "3_105", "3_110", "3_113"
 		]
-		set: [
+		sets: [
 			1, 2, 3
 		]
+		blocks: [
+			fotr_block
+		]
 		hall: false
 	}
 	{
@@ -657,9 +859,12 @@
 		sites: FELLOWSHIP
 		cancelRingBearerSkirmish: true
 		maximumSameName: 1
-		set: [
+		sets: [
 			1, 2, 3
 		]
+		blocks: [
+			fotr_block
+		]
 		hall: false
 	}
 	{
@@ -667,9 +872,15 @@
 		code: movie_highlander
 		sites: KING
 		maximumSameName: 1
-		set: [
+		sets: [
 			1, 2, 3, 4, 5, 6, 7, 8, 9, 10
 		]
+		blocks: [
+			fotr_block
+			ttt_block
+			king_block
+			Additional Sets|Reflections:9
+		]
 		hall: false
 	}
 	{
@@ -678,9 +889,12 @@
 		sites: HOBBIT
 		cancelRingBearerSkirmish: true
 		Limited: true
-		set: [
+		sets: [
 			30, 31, 32, 33
 		]
+		blocks: [
+			hobbit
+		]
 		hall: false
 	}
 	{
@@ -689,9 +903,13 @@
 		sites: FELLOWSHIP
 		cancelRingBearerSkirmish: true
 		maximumSameName: 100
-		set: [
+		sets: [
 			0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19
 		]
+		blocks: [
+			fotr_block
+			Other|Promotional:0,The Two Towers:4,Battle of Helm's Deep:5,Ents of Fangorn:6The Return of the King:7,Siege of Gondor:8,Reflections:9,Mount Doom:10,Shadows:11,Black Rider:12,Bloodlines:13,Expanded Middle-earth:14,The Hunters:15,The Wraith Collection:16,Rise of Saruman:17,Treachery & Deceit:18,Age's End:19
+		]
 		hall: false
 	}
 	{
@@ -700,9 +918,12 @@
 		sites: FELLOWSHIP
 		cancelRingBearerSkirmish: true
 		maximumSameName: 100
-		set: [
+		sets: [
 			1, 2, 3, 101
 		]
+		blocks: [
+			Fellowship Block|The Fellowship of the Ring:1,Mines of Moria:2,Realms of the Elf-lords:3,V1 - Shadow of the Past:101
+		]
 		errataSets: [
 			51,52,53
 			71,72,73
@@ -715,9 +936,13 @@
 		sites: TWO_TOWERS
 		cancelRingBearerSkirmish: true
 		maximumSameName: 100
-		set: [
+		sets: [
 			0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19
 		]
+		blocks: [
+			ttt_block
+			Other|Promotional:0,The Fellowship of the Ring:1,Mines of Moria:2,Realms of the Elf-lords:3,The Return of the King:7,Siege of Gondor:8,Reflections:9,Mount Doom:10,Shadows:11,Black Rider:12,Bloodlines:13,Expanded Middle-earth:14,The Hunters:15,The Wraith Collection:16,Rise of Saruman:17,Treachery & Deceit:18,Age's End:19
+		]
 		hall: false
 	}
 	{
@@ -726,9 +951,14 @@
 		sites: KING
 		cancelRingBearerSkirmish: true
 		maximumSameName: 100
-		set: [
+		sets: [
 			0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19
 		]
+		blocks: [
+			king_block
+			Additional Sets|Reflections:9,
+			Other|Promotional:0,The Fellowship of the Ring:1,Mines of Moria:2,Realms of the Elf-lords:3,The Two Towers:4,Battle of Helm's Deep:5,Ents of Fangorn:6,Reflections:9,Shadows:11,Black Rider:12,Bloodlines:13,Expanded Middle-earth:14,The Hunters:15,The Wraith Collection:16,Rise of Saruman:17,Treachery & Deceit:18,Age's End:19
+		]
 		hall: false
 	}
 	{
@@ -737,9 +967,15 @@
 		sites: SHADOWS
 		cancelRingBearerSkirmish: false
 		maximumSameName: 100
-		set: [
+		sets: [
 			0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19
 		]
+		blocks: [
+			war_block
+			Additional Sets|Expanded Middle-earth:14,The Wraith Collection:16,Age's End:19
+			Movie Block|Promotional:0,The Fellowship of the Ring:1,Mines of Moria:2,Realms of the Elf-lords:3,The Two Towers:4,Battle of Helm's Deep:5,Ents of Fangorn:6,The Return of the King:7,Siege of Gondor:8,Reflections:9,Mount Doom:10
+			hunter_block
+		]
 		hall: false
 	}
 	{
@@ -748,9 +984,15 @@
 		sites: SHADOWS
 		cancelRingBearerSkirmish: false
 		maximumSameName: 100
-		set: [
+		sets: [
 			0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19
 		]
+		blocks: [
+			war_block
+			hunter_block
+			Additional Sets|Expanded Middle-earth:14,The Wraith Collection:16,Age's End:19
+			Movie Block|Promotional:0,The Fellowship of the Ring:1,Mines of Moria:2,Realms of the Elf-lords:3,The Two Towers:4,Battle of Helm's Deep:5,Ents of Fangorn:6,The Return of the King:7,Siege of Gondor:8,Reflections:9,Mount Doom:10
+		]
 		hall: false
 	}
 	{
@@ -759,9 +1001,15 @@
 		sites: MULTIPATH
 		cancelRingBearerSkirmish: false
 		maximumSameName: 100
-		set: [
+		sets: [
 			1, 2, 3, 4, 5, 6, 7, 8, 9, 10
 		]
+		blocks: [
+			fotr_block
+			ttt_block
+			king_block
+			Additional Sets|Reflections:9
+		]
 		hall: false
 	}
 ]
diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/setConfig.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/setConfig.hjson
index c9c34e7c3..78eaf5d02 100644
--- a/gemp-lotr/gemp-lotr-cards/src/main/resources/setConfig.hjson
+++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/setConfig.hjson
@@ -1,588 +1,588 @@
 [
-  {
-    setId: 0
-    setName: Promotional
-    rarityFile: /set0-rarity.txt
-    needsLoading: false
-  }
-  {
-    setId: 1
-    setName: The Fellowship of the Ring
-    rarityFile: /set1-rarity.txt
-    needsLoading: false
-  }
-  {
-    setId: 2
-    setName: Mines of Moria
-    rarityFile: /set2-rarity.txt
-    needsLoading: false
-  }
-  {
-    setId: 3
-    setName: Realms of the Elf-lords
-    rarityFile: /set3-rarity.txt
-    needsLoading: false
-  }
-  {
-    setId: 4
-    setName: The Two Towers
-    rarityFile: /set4-rarity.txt
-    needsLoading: false
-  }
-  {
-    setId: 5
-    setName: Battle of Helm's Deep
-    rarityFile: /set5-rarity.txt
-    needsLoading: false
-  }
-  {
-    setId: 6
-    setName: Ents of Fangorn
-    rarityFile: /set6-rarity.txt
-    needsLoading: false
-  }
-  {
-    setId: 7
-    setName: The Return of the King
-    rarityFile: /set7-rarity.txt
-    needsLoading: false
-  }
-  {
-    setId: 8
-    setName: Siege of Gondor
-    rarityFile: /set8-rarity.txt
-    needsLoading: false
-  }
-  {
-    setId: 9
-    setName: Reflections
-    rarityFile: /set9-rarity.txt
-    needsLoading: false
-  }
-  {
-    setId: 10
-    setName: Mount Doom
-    rarityFile: /set10-rarity.txt
-    needsLoading: false
-  }
-  {
-    setId: 11
-    setName: Shadows
-    rarityFile: /set11-rarity.txt
-    needsLoading: false
-  }
-  {
-    setId: 12
-    setName: Black Rider
-    rarityFile: /set12-rarity.txt
-    needsLoading: false
-  }
-  {
-    setId: 13
-    setName: Bloodlines
-    rarityFile: /set13-rarity.txt
-    needsLoading: false
-  }
-  {
-    setId: 14
-    setName: Expanded Middle-earth
-    rarityFile: /set14-rarity.txt
-    needsLoading: false
-  }
-  {
-    setId: 15
-    setName: The Hunters
-    rarityFile: /set15-rarity.txt
-    needsLoading: false
-  }
-  {
-    setId: 16
-    setName: The Wraith Collection
-    rarityFile: /set16-rarity.txt
-    needsLoading: false
-  }
-  {
-    setId: 17
-    setName: Rise of Saruman
-    rarityFile: /set17-rarity.txt
-    needsLoading: false
-  }
-  {
-    setId: 18
-    setName: Treachery & Deceit
-    rarityFile: /set18-rarity.txt
-    needsLoading: false
-  }
-  {
-    setId: 19
-    setName: Ages End
-    rarityFile: /set19-rarity.txt
-    needsLoading: false
-  }
-  {
-    setId: 30
-    setName: Main Deck
-    rarityFile: /set30-rarity.txt
-    originalSet: false
-    merchantable: false
-    needsLoading: false
-  }
-  {
-    setId: 31
-    setName: The Short Rest
-    rarityFile: /set31-rarity.txt
-    originalSet: false
-    merchantable: false
-    needsLoading: false
-  }
-  {
-    setId: 32
-    setName: The Clouds Burst
-    rarityFile: /set32-rarity.txt
-    originalSet: false
-    merchantable: false
-    needsLoading: false
-  }
-  {
-    setId: 33
-    setName: Fire and Water
-    rarityFile: /set33-rarity.txt
-    originalSet: false
-    merchantable: false
-    needsLoading: false
-  }
-  # {
-  #   setId: 40
-  #   setName: Second Edition
-  #   rarityFile: /set40-rarity.txt
-  #   originalSet: false
-  #   merchantable: false
-  #   needsLoading: false
-  #   playable: false
-  # }
+	{
+		setId: 0
+		setName: Promotional
+		rarityFile: /set0-rarity.txt
+		needsLoading: false
+	}
+	{
+		setId: 1
+		setName: The Fellowship of the Ring
+		rarityFile: /set1-rarity.txt
+		needsLoading: false
+	}
+	{
+		setId: 2
+		setName: Mines of Moria
+		rarityFile: /set2-rarity.txt
+		needsLoading: false
+	}
+	{
+		setId: 3
+		setName: Realms of the Elf-lords
+		rarityFile: /set3-rarity.txt
+		needsLoading: false
+	}
+	{
+		setId: 4
+		setName: The Two Towers
+		rarityFile: /set4-rarity.txt
+		needsLoading: false
+	}
+	{
+		setId: 5
+		setName: Battle of Helm's Deep
+		rarityFile: /set5-rarity.txt
+		needsLoading: false
+	}
+	{
+		setId: 6
+		setName: Ents of Fangorn
+		rarityFile: /set6-rarity.txt
+		needsLoading: false
+	}
+	{
+		setId: 7
+		setName: The Return of the King
+		rarityFile: /set7-rarity.txt
+		needsLoading: false
+	}
+	{
+		setId: 8
+		setName: Siege of Gondor
+		rarityFile: /set8-rarity.txt
+		needsLoading: false
+	}
+	{
+		setId: 9
+		setName: Reflections
+		rarityFile: /set9-rarity.txt
+		needsLoading: false
+	}
+	{
+		setId: 10
+		setName: Mount Doom
+		rarityFile: /set10-rarity.txt
+		needsLoading: false
+	}
+	{
+		setId: 11
+		setName: Shadows
+		rarityFile: /set11-rarity.txt
+		needsLoading: false
+	}
+	{
+		setId: 12
+		setName: Black Rider
+		rarityFile: /set12-rarity.txt
+		needsLoading: false
+	}
+	{
+		setId: 13
+		setName: Bloodlines
+		rarityFile: /set13-rarity.txt
+		needsLoading: false
+	}
+	{
+		setId: 14
+		setName: Expanded Middle-earth
+		rarityFile: /set14-rarity.txt
+		needsLoading: false
+	}
+	{
+		setId: 15
+		setName: The Hunters
+		rarityFile: /set15-rarity.txt
+		needsLoading: false
+	}
+	{
+		setId: 16
+		setName: The Wraith Collection
+		rarityFile: /set16-rarity.txt
+		needsLoading: false
+	}
+	{
+		setId: 17
+		setName: Rise of Saruman
+		rarityFile: /set17-rarity.txt
+		needsLoading: false
+	}
+	{
+		setId: 18
+		setName: Treachery & Deceit
+		rarityFile: /set18-rarity.txt
+		needsLoading: false
+	}
+	{
+		setId: 19
+		setName: Ages End
+		rarityFile: /set19-rarity.txt
+		needsLoading: false
+	}
+	{
+		setId: 30
+		setName: Main Deck
+		rarityFile: /set30-rarity.txt
+		originalSet: false
+		merchantable: false
+		needsLoading: false
+	}
+	{
+		setId: 31
+		setName: The Short Rest
+		rarityFile: /set31-rarity.txt
+		originalSet: false
+		merchantable: false
+		needsLoading: false
+	}
+	{
+		setId: 32
+		setName: The Clouds Burst
+		rarityFile: /set32-rarity.txt
+		originalSet: false
+		merchantable: false
+		needsLoading: false
+	}
+	{
+		setId: 33
+		setName: Fire and Water
+		rarityFile: /set33-rarity.txt
+		originalSet: false
+		merchantable: false
+		needsLoading: false
+	}
+	# {
+	#   setId: 40
+	#   setName: Second Edition
+	#   rarityFile: /set40-rarity.txt
+	#   originalSet: false
+	#   merchantable: false
+	#   needsLoading: false
+	#   playable: false
+	# }
 
 
-  {
-    setId: 50
-    setName: PC Promo Errata
-    rarityFile: /errata/set50-rarity.txt
-    originalSet: false
-    merchantable: false
-    needsLoading: false
-    playable: true
-  }
-  {
-    setId: 51
-    setName: PC FotR Errata
-    rarityFile: /errata/set51-rarity.txt
-    originalSet: false
-    merchantable: false
-    needsLoading: false
-    playable: true
-  }
-  {
-    setId: 52
-    setName: PC MoM Errata
-    rarityFile: /errata/set52-rarity.txt
-    originalSet: false
-    merchantable: false
-    needsLoading: false
-    playable: true
-  }
-  {
-    setId: 53
-    setName: PC RotEL Errata
-    rarityFile: /errata/set53-rarity.txt
-    originalSet: false
-    merchantable: false
-    needsLoading: false
-    playable: true
-  }
-  {
-    setId: 54
-    setName: PC TTT Errata
-    rarityFile: /errata/set54-rarity.txt
-    originalSet: false
-    merchantable: false
-    needsLoading: false
-    playable: true
-  }
-  {
-    setId: 55
-    setName: PC BoHD Errata
-    rarityFile: /errata/set55-rarity.txt
-    originalSet: false
-    merchantable: false
-    needsLoading: false
-    playable: true
-  }
-  {
-    setId: 56
-    setName: PC EoF Errata
-    rarityFile: /errata/set56-rarity.txt
-    originalSet: false
-    merchantable: false
-    needsLoading: false
-    playable: true
-  }
-  {
-    setId: 57
-    setName: PC RotK Errata
-    rarityFile: /errata/set57-rarity.txt
-    originalSet: false
-    merchantable: false
-    needsLoading: false
-    playable: true
-  }
-  {
-    setId: 58
-    setName: PC SoG Errata
-    rarityFile: /errata/set58-rarity.txt
-    originalSet: false
-    merchantable: false
-    needsLoading: false
-    playable: true
-  }
-  {
-    setId: 59
-    setName: PC Reflections Errata
-    rarityFile: /errata/set59-rarity.txt
-    originalSet: false
-    merchantable: false
-    needsLoading: false
-    playable: true
-  }
+	{
+		setId: 50
+		setName: PC Promo Errata
+		rarityFile: /errata/set50-rarity.txt
+		originalSet: false
+		merchantable: false
+		needsLoading: false
+		playable: true
+	}
+	{
+		setId: 51
+		setName: PC FotR Errata
+		rarityFile: /errata/set51-rarity.txt
+		originalSet: false
+		merchantable: false
+		needsLoading: false
+		playable: true
+	}
+	{
+		setId: 52
+		setName: PC MoM Errata
+		rarityFile: /errata/set52-rarity.txt
+		originalSet: false
+		merchantable: false
+		needsLoading: false
+		playable: true
+	}
+	{
+		setId: 53
+		setName: PC RotEL Errata
+		rarityFile: /errata/set53-rarity.txt
+		originalSet: false
+		merchantable: false
+		needsLoading: false
+		playable: true
+	}
+	{
+		setId: 54
+		setName: PC TTT Errata
+		rarityFile: /errata/set54-rarity.txt
+		originalSet: false
+		merchantable: false
+		needsLoading: false
+		playable: true
+	}
+	{
+		setId: 55
+		setName: PC BoHD Errata
+		rarityFile: /errata/set55-rarity.txt
+		originalSet: false
+		merchantable: false
+		needsLoading: false
+		playable: true
+	}
+	{
+		setId: 56
+		setName: PC EoF Errata
+		rarityFile: /errata/set56-rarity.txt
+		originalSet: false
+		merchantable: false
+		needsLoading: false
+		playable: true
+	}
+	{
+		setId: 57
+		setName: PC RotK Errata
+		rarityFile: /errata/set57-rarity.txt
+		originalSet: false
+		merchantable: false
+		needsLoading: false
+		playable: true
+	}
+	{
+		setId: 58
+		setName: PC SoG Errata
+		rarityFile: /errata/set58-rarity.txt
+		originalSet: false
+		merchantable: false
+		needsLoading: false
+		playable: true
+	}
+	{
+		setId: 59
+		setName: PC Reflections Errata
+		rarityFile: /errata/set59-rarity.txt
+		originalSet: false
+		merchantable: false
+		needsLoading: false
+		playable: true
+	}
 
 
-  {
-    setId: 80
-    setName: PC MD Errata
-    rarityFile: /errata/set80-rarity.txt
-    originalSet: false
-    merchantable: false
-    needsLoading: false
-    playable: true
-  }
-  {
-    setId: 81
-    setName: PC Shadows Errata
-    rarityFile: /errata/set81-rarity.txt
-    originalSet: false
-    merchantable: false
-    needsLoading: false
-    playable: true
-  }
-  {
-    setId: 82
-    setName: PC BR Errata
-    rarityFile: /errata/set82-rarity.txt
-    originalSet: false
-    merchantable: false
-    needsLoading: false
-    playable: true
-  }
-  {
-    setId: 83
-    setName: PC Bloodlines Errata
-    rarityFile: /errata/set83-rarity.txt
-    originalSet: false
-    merchantable: false
-    needsLoading: false
-    playable: true
-  }
-  {
-    setId: 84
-    setName: PC EMM Errata
-    rarityFile: /errata/set84-rarity.txt
-    originalSet: false
-    merchantable: false
-    needsLoading: false
-    playable: true
-  }
-  {
-    setId: 85
-    setName: PC Hunters Errata
-    rarityFile: /errata/set85-rarity.txt
-    originalSet: false
-    merchantable: false
-    needsLoading: false
-    playable: true
-  }
-  {
-    setId: 86
-    setName: PC TWC Errata
-    rarityFile: /errata/set86-rarity.txt
-    originalSet: false
-    merchantable: false
-    needsLoading: false
-    playable: true
-  }
-  {
-    setId: 87
-    setName: PC RoS Errata
-    rarityFile: /errata/set87-rarity.txt
-    originalSet: false
-    merchantable: false
-    needsLoading: false
-    playable: true
-  }
-  {
-    setId: 88
-    setName: PC T&D Errata
-    rarityFile: /errata/set88-rarity.txt
-    originalSet: false
-    merchantable: false
-    needsLoading: false
-    playable: true
-  }
-  {
-    setId: 89
-    setName: PC AE Errata
-    rarityFile: /errata/set89-rarity.txt
-    originalSet: false
-    merchantable: false
-    needsLoading: false
-    playable: true
-  }
-  {
-    setId: 70
-    setName: TEST-PC Promo Errata
-    rarityFile: /errata/set70-rarity.txt
-    originalSet: false
-    merchantable: false
-    needsLoading: false
-    playable: true
-  }
-  {
-    setId: 71
-    setName: TEST-PC FotR Errata
-    rarityFile: /errata/set71-rarity.txt
-    originalSet: false
-    merchantable: false
-    needsLoading: false
-    playable: true
-  }
-  {
-    setId: 72
-    setName: TEST-PC MoM Errata
-    rarityFile: /errata/set72-rarity.txt
-    originalSet: false
-    merchantable: false
-    needsLoading: false
-    playable: true
-  }
-  {
-    setId: 73
-    setName: TEST-PC RotEL Errata
-    rarityFile: /errata/set73-rarity.txt
-    originalSet: false
-    merchantable: false
-    needsLoading: false
-    playable: true
-  }
-  {
-    setId: 74
-    setName: TEST-PC TTT Errata
-    rarityFile: /errata/set74-rarity.txt
-    originalSet: false
-    merchantable: false
-    needsLoading: false
-    playable: true
-  }
-  {
-    setId: 75
-    setName: TEST-PC BoHD Errata
-    rarityFile: /errata/set75-rarity.txt
-    originalSet: false
-    merchantable: false
-    needsLoading: false
-    playable: true
-  }
-  {
-    setId: 76
-    setName: TEST-PC EoF Errata
-    rarityFile: /errata/set76-rarity.txt
-    originalSet: false
-    merchantable: false
-    needsLoading: false
-    playable: true
-  }
-  {
-    setId: 77
-    setName: TEST-PC RotK Errata
-    rarityFile: /errata/set77-rarity.txt
-    originalSet: false
-    merchantable: false
-    needsLoading: false
-    playable: true
-  }
-  {
-    setId: 78
-    setName: TEST-PC SoG Errata
-    rarityFile: /errata/set78-rarity.txt
-    originalSet: false
-    merchantable: false
-    needsLoading: false
-    playable: true
-  }
-  {
-    setId: 79
-    setName: TEST-PC Reflections Errata
-    rarityFile: /errata/set79-rarity.txt
-    originalSet: false
-    merchantable: false
-    needsLoading: false
-    playable: true
-  }
-  {
-    setId: 80
-    setName: TEST-PC MD Errata
-    rarityFile: /errata/set80-rarity.txt
-    originalSet: false
-    merchantable: false
-    needsLoading: false
-    playable: true
-  }
-  {
-    setId: 81
-    setName: TEST-PC Shadows Errata
-    rarityFile: /errata/set81-rarity.txt
-    originalSet: false
-    merchantable: false
-    needsLoading: false
-    playable: true
-  }
-  {
-    setId: 82
-    setName: TEST-PC BR Errata
-    rarityFile: /errata/set82-rarity.txt
-    originalSet: false
-    merchantable: false
-    needsLoading: false
-    playable: true
-  }
-  {
-    setId: 83
-    setName: TEST-PC Bloodlines Errata
-    rarityFile: /errata/set83-rarity.txt
-    originalSet: false
-    merchantable: false
-    needsLoading: false
-    playable: true
-  }
-  {
-    setId: 84
-    setName: TEST-PC EMM Errata
-    rarityFile: /errata/set84-rarity.txt
-    originalSet: false
-    merchantable: false
-    needsLoading: false
-    playable: true
-  }
-  {
-    setId: 85
-    setName: TEST-PC Hunters Errata
-    rarityFile: /errata/set85-rarity.txt
-    originalSet: false
-    merchantable: false
-    needsLoading: false
-    playable: true
-  }
-  {
-    setId: 86
-    setName: TEST-PC TWC Errata
-    rarityFile: /errata/set86-rarity.txt
-    originalSet: false
-    merchantable: false
-    needsLoading: false
-    playable: true
-  }
-  {
-    setId: 87
-    setName: TEST-PC RoS Errata
-    rarityFile: /errata/set87-rarity.txt
-    originalSet: false
-    merchantable: false
-    needsLoading: false
-    playable: true
-  }
-  {
-    setId: 88
-    setName: TEST-PC T&D Errata
-    rarityFile: /errata/set88-rarity.txt
-    originalSet: false
-    merchantable: false
-    needsLoading: false
-    playable: true
-  }
-  {
-    setId: 89
-    setName: TEST-PC AE Errata
-    rarityFile: /errata/set89-rarity.txt
-    originalSet: false
-    merchantable: false
-    needsLoading: false
-    playable: true
-  }
+	{
+		setId: 80
+		setName: PC MD Errata
+		rarityFile: /errata/set80-rarity.txt
+		originalSet: false
+		merchantable: false
+		needsLoading: false
+		playable: true
+	}
+	{
+		setId: 81
+		setName: PC Shadows Errata
+		rarityFile: /errata/set81-rarity.txt
+		originalSet: false
+		merchantable: false
+		needsLoading: false
+		playable: true
+	}
+	{
+		setId: 82
+		setName: PC BR Errata
+		rarityFile: /errata/set82-rarity.txt
+		originalSet: false
+		merchantable: false
+		needsLoading: false
+		playable: true
+	}
+	{
+		setId: 83
+		setName: PC Bloodlines Errata
+		rarityFile: /errata/set83-rarity.txt
+		originalSet: false
+		merchantable: false
+		needsLoading: false
+		playable: true
+	}
+	{
+		setId: 84
+		setName: PC EMM Errata
+		rarityFile: /errata/set84-rarity.txt
+		originalSet: false
+		merchantable: false
+		needsLoading: false
+		playable: true
+	}
+	{
+		setId: 85
+		setName: PC Hunters Errata
+		rarityFile: /errata/set85-rarity.txt
+		originalSet: false
+		merchantable: false
+		needsLoading: false
+		playable: true
+	}
+	{
+		setId: 86
+		setName: PC TWC Errata
+		rarityFile: /errata/set86-rarity.txt
+		originalSet: false
+		merchantable: false
+		needsLoading: false
+		playable: true
+	}
+	{
+		setId: 87
+		setName: PC RoS Errata
+		rarityFile: /errata/set87-rarity.txt
+		originalSet: false
+		merchantable: false
+		needsLoading: false
+		playable: true
+	}
+	{
+		setId: 88
+		setName: PC T&D Errata
+		rarityFile: /errata/set88-rarity.txt
+		originalSet: false
+		merchantable: false
+		needsLoading: false
+		playable: true
+	}
+	{
+		setId: 89
+		setName: PC AE Errata
+		rarityFile: /errata/set89-rarity.txt
+		originalSet: false
+		merchantable: false
+		needsLoading: false
+		playable: true
+	}
+	{
+		setId: 70
+		setName: TEST-PC Promo Errata
+		rarityFile: /errata/set70-rarity.txt
+		originalSet: false
+		merchantable: false
+		needsLoading: false
+		playable: true
+	}
+	{
+		setId: 71
+		setName: TEST-PC FotR Errata
+		rarityFile: /errata/set71-rarity.txt
+		originalSet: false
+		merchantable: false
+		needsLoading: false
+		playable: true
+	}
+	{
+		setId: 72
+		setName: TEST-PC MoM Errata
+		rarityFile: /errata/set72-rarity.txt
+		originalSet: false
+		merchantable: false
+		needsLoading: false
+		playable: true
+	}
+	{
+		setId: 73
+		setName: TEST-PC RotEL Errata
+		rarityFile: /errata/set73-rarity.txt
+		originalSet: false
+		merchantable: false
+		needsLoading: false
+		playable: true
+	}
+	{
+		setId: 74
+		setName: TEST-PC TTT Errata
+		rarityFile: /errata/set74-rarity.txt
+		originalSet: false
+		merchantable: false
+		needsLoading: false
+		playable: true
+	}
+	{
+		setId: 75
+		setName: TEST-PC BoHD Errata
+		rarityFile: /errata/set75-rarity.txt
+		originalSet: false
+		merchantable: false
+		needsLoading: false
+		playable: true
+	}
+	{
+		setId: 76
+		setName: TEST-PC EoF Errata
+		rarityFile: /errata/set76-rarity.txt
+		originalSet: false
+		merchantable: false
+		needsLoading: false
+		playable: true
+	}
+	{
+		setId: 77
+		setName: TEST-PC RotK Errata
+		rarityFile: /errata/set77-rarity.txt
+		originalSet: false
+		merchantable: false
+		needsLoading: false
+		playable: true
+	}
+	{
+		setId: 78
+		setName: TEST-PC SoG Errata
+		rarityFile: /errata/set78-rarity.txt
+		originalSet: false
+		merchantable: false
+		needsLoading: false
+		playable: true
+	}
+	{
+		setId: 79
+		setName: TEST-PC Reflections Errata
+		rarityFile: /errata/set79-rarity.txt
+		originalSet: false
+		merchantable: false
+		needsLoading: false
+		playable: true
+	}
+	{
+		setId: 80
+		setName: TEST-PC MD Errata
+		rarityFile: /errata/set80-rarity.txt
+		originalSet: false
+		merchantable: false
+		needsLoading: false
+		playable: true
+	}
+	{
+		setId: 81
+		setName: TEST-PC Shadows Errata
+		rarityFile: /errata/set81-rarity.txt
+		originalSet: false
+		merchantable: false
+		needsLoading: false
+		playable: true
+	}
+	{
+		setId: 82
+		setName: TEST-PC BR Errata
+		rarityFile: /errata/set82-rarity.txt
+		originalSet: false
+		merchantable: false
+		needsLoading: false
+		playable: true
+	}
+	{
+		setId: 83
+		setName: TEST-PC Bloodlines Errata
+		rarityFile: /errata/set83-rarity.txt
+		originalSet: false
+		merchantable: false
+		needsLoading: false
+		playable: true
+	}
+	{
+		setId: 84
+		setName: TEST-PC EMM Errata
+		rarityFile: /errata/set84-rarity.txt
+		originalSet: false
+		merchantable: false
+		needsLoading: false
+		playable: true
+	}
+	{
+		setId: 85
+		setName: TEST-PC Hunters Errata
+		rarityFile: /errata/set85-rarity.txt
+		originalSet: false
+		merchantable: false
+		needsLoading: false
+		playable: true
+	}
+	{
+		setId: 86
+		setName: TEST-PC TWC Errata
+		rarityFile: /errata/set86-rarity.txt
+		originalSet: false
+		merchantable: false
+		needsLoading: false
+		playable: true
+	}
+	{
+		setId: 87
+		setName: TEST-PC RoS Errata
+		rarityFile: /errata/set87-rarity.txt
+		originalSet: false
+		merchantable: false
+		needsLoading: false
+		playable: true
+	}
+	{
+		setId: 88
+		setName: TEST-PC T&D Errata
+		rarityFile: /errata/set88-rarity.txt
+		originalSet: false
+		merchantable: false
+		needsLoading: false
+		playable: true
+	}
+	{
+		setId: 89
+		setName: TEST-PC AE Errata
+		rarityFile: /errata/set89-rarity.txt
+		originalSet: false
+		merchantable: false
+		needsLoading: false
+		playable: true
+	}
 
-  {
-    setId: 100
-    setName: PC Supplements
-    rarityFile: /set100-rarity.txt
-    originalSet: false
-    merchantable: true
-    needsLoading: false
-    playable: true
-  }
+	{
+		setId: 100
+		setName: PC Supplements
+		rarityFile: /set100-rarity.txt
+		originalSet: false
+		merchantable: true
+		needsLoading: false
+		playable: true
+	}
 
-  {
-    setId: 101
-    setName: Shadow of the Past
-    rarityFile: /set101-rarity.txt
-    originalSet: false
-    merchantable: true
-    needsLoading: false
-    playable: true
-  }
-  
-  {
-    setId: 102
-    setName: King of the Golden Hall
-    rarityFile: /set102-rarity.txt
-    originalSet: false
-    merchantable: true
-    needsLoading: false
-    playable: true
-  }
+	{
+		setId: 101
+		setName: Shadow of the Past
+		rarityFile: /set101-rarity.txt
+		originalSet: false
+		merchantable: true
+		needsLoading: false
+		playable: true
+	}
+	
+	{
+		setId: 102
+		setName: King of the Golden Hall
+		rarityFile: /set102-rarity.txt
+		originalSet: false
+		merchantable: true
+		needsLoading: false
+		playable: true
+	}
 
-  {
-    setId: 150
-    setName: TEST-PC Supplements
-    rarityFile: /set150-rarity.txt
-    originalSet: false
-    merchantable: false
-    needsLoading: false
-    playable: true
-  }
+	{
+		setId: 150
+		setName: TEST-PC Supplements
+		rarityFile: /set150-rarity.txt
+		originalSet: false
+		merchantable: false
+		needsLoading: false
+		playable: true
+	}
 
-  {
-    setId: 151
-    setName: TEST-Shadow of the Past
-    rarityFile: /set151-rarity.txt
-    originalSet: false
-    merchantable: false
-    needsLoading: false
-    playable: true
-  }
-  
-  {
-    setId: 152
-    setName: TEST-King of the Golden Hall
-    rarityFile: /set152-rarity.txt
-    originalSet: false
-    merchantable: false
-    needsLoading: false
-    playable: true
-  }
+	{
+		setId: 151
+		setName: TEST-Shadow of the Past
+		rarityFile: /set151-rarity.txt
+		originalSet: false
+		merchantable: false
+		needsLoading: false
+		playable: true
+	}
+	
+	{
+		setId: 152
+		setName: TEST-King of the Golden Hall
+		rarityFile: /set152-rarity.txt
+		originalSet: false
+		merchantable: false
+		needsLoading: false
+		playable: true
+	}
 
 ]
\ No newline at end of file
diff --git a/gemp-lotr/gemp-lotr-common/src/main/java/com/gempukku/lotro/common/JSONDefs.java b/gemp-lotr/gemp-lotr-common/src/main/java/com/gempukku/lotro/common/JSONDefs.java
index 7829d1d68..b0073042f 100644
--- a/gemp-lotr/gemp-lotr-common/src/main/java/com/gempukku/lotro/common/JSONDefs.java
+++ b/gemp-lotr/gemp-lotr-common/src/main/java/com/gempukku/lotro/common/JSONDefs.java
@@ -49,7 +49,9 @@ public class JSONDefs {
         public int maximumSameName = 4;
         public boolean mulliganRule = true;
         public boolean usesMaps = false;
-        public ArrayList<Integer> set;
+        public ArrayList<Integer> sets;
+        public ArrayList<String> blocks;
+        public ArrayList<BlockFilter> blockFilters;
         public ArrayList<String> banned = new ArrayList<>();
         public ArrayList<String> restricted = new ArrayList<>();
         public ArrayList<String> valid = new ArrayList<>();
@@ -62,6 +64,12 @@ public class JSONDefs {
 
     }
 
+    public static class BlockFilter {
+        public String name;
+        public String filter;
+        public Map<String, String> setFilters = new HashMap<>();
+    }
+
     public static class Set {
         public int setId;
         public String setName;
diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/LotroCardBlueprintLibrary.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/LotroCardBlueprintLibrary.java
index 38feda214..7fe1f25ae 100644
--- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/LotroCardBlueprintLibrary.java
+++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/LotroCardBlueprintLibrary.java
@@ -328,7 +328,7 @@ public class LotroCardBlueprintLibrary {
         }
     }
 
-    public boolean hasAlternateInSet(String blueprintId, int setNo) {
+    public boolean hasAlternateInSet(String blueprintId, String setNo) {
         try {
             collectionReady.acquire();
             var alternatives = _fullBlueprintMapping.get(blueprintId);
diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/LotroFormat.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/LotroFormat.java
index 65251fe34..67ca6eb2f 100644
--- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/LotroFormat.java
+++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/LotroFormat.java
@@ -2,6 +2,7 @@ package com.gempukku.lotro.game;
 
 import com.gempukku.lotro.common.JSONDefs;
 import com.gempukku.lotro.common.SitesBlock;
+import com.gempukku.lotro.game.packs.SetDefinition;
 import com.gempukku.lotro.logic.vo.LotroDeck;
 
 import java.util.List;
@@ -47,7 +48,7 @@ public interface LotroFormat {
 
     LotroDeck applyErrata(LotroDeck deck);
 
-    List<Integer> getValidSets();
+    List<String> getValidSets();
 
     List<String> getBannedCards();
 
@@ -75,4 +76,5 @@ public interface LotroFormat {
 
     Adventure getAdventure();
     JSONDefs.Format Serialize();
+    void generateBlockFilter(Map<String, LotroFormat> allFormats, Map<String, SetDefinition> allSets);
 }
diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/SortAndFilterCards.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/SortAndFilterCards.java
index 86e52fc22..6bd9e0933 100644
--- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/SortAndFilterCards.java
+++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/SortAndFilterCards.java
@@ -18,7 +18,12 @@ public class SortAndFilterCards {
         var rarities = params.getOrDefault("rarity", new ArrayList<>());
         var side = Side.Parse(getSingleton(params.get("side")));
         var sort = params.getOrDefault("sort", new ArrayList<>());
+
+        var formats = params.getOrDefault("format", new ArrayList<>());
+        var blocks = params.getOrDefault("block", new ArrayList<>());
         var sets = params.getOrDefault("set", new ArrayList<>());
+
+
         var cardTypes = getEnumFilter(CardType.values(), CardType.class, params.get("cardtype"), false);
 
         var cultures = getEnumFilter(Culture.values(), Culture.class, params.get("culture"), true);
@@ -75,7 +80,16 @@ public class SortAndFilterCards {
             var card = cardBPCache.get(blueprintId);
             boolean valid = true;
 
-            if(!IsFlagAccepted(canStartWithRing, card.canStartWithRing()))
+            if(!formats.isEmpty() && !isInSetOrFormat(blueprintId, card, formats, cardLibrary, formatLibrary))
+                continue;
+
+            if(!blocks.isEmpty() && !isInSetOrFormat(blueprintId, card, blocks, cardLibrary, formatLibrary))
+                continue;
+
+            if(!sets.isEmpty() && !isInSetOrFormat(blueprintId, card, sets, cardLibrary, formatLibrary))
+                continue;
+
+            if(!isFlagAccepted(canStartWithRing, card.canStartWithRing()))
                 continue;
 
             if(product != null) {
@@ -118,9 +132,6 @@ public class SortAndFilterCards {
                 }
             }
 
-            if(!sets.isEmpty() && !isInSets(blueprintId, card, sets, cardLibrary, formatLibrary))
-                continue;
-
             if(!cardTypes.isEmpty() && !cardTypes.contains(card.getCardType()))
                 continue;
 
@@ -238,19 +249,28 @@ public class SortAndFilterCards {
         return result;
     }
 
-    private boolean isInSets(String blueprintId, LotroCardBlueprint card, List<String> setFilters, LotroCardBlueprintLibrary library, LotroFormatLibrary formatLibrary) {
+    private boolean isInSetOrFormat(String blueprintId, LotroCardBlueprint card, List<String> setFilters, LotroCardBlueprintLibrary library, LotroFormatLibrary formatLibrary) {
+        boolean isInAnySet = false;
+
         for (String set : setFilters) {
+            if(isJSInvalidString(set))
+                continue;
+
             LotroFormat format = formatLibrary.getFormat(set);
 
             if (format != null) {
+                String invalid = "";
                 if (card.getCardType() == CardType.SITE) {
-                    String invalid = format.validateSite(blueprintId);
-                    if(!StringUtils.isEmpty(invalid))
-                        return false;
+                    invalid = format.validateSite(blueprintId);
+                }
+                else {
+                    invalid = format.validateCard(blueprintId);
                 }
 
-                String invalid = format.validateCard(blueprintId);
-                return StringUtils.isEmpty(invalid);
+                if(StringUtils.isEmpty(invalid)) {
+                    isInAnySet = true;
+                }
+                continue;
             }
 
             if (set.contains("-")) {
@@ -258,17 +278,18 @@ public class SortAndFilterCards {
                 int min = Integer.parseInt(split[0]);
                 int max = Integer.parseInt(split[1]);
                 for (int setNo = min; setNo <= max; setNo++) {
-                    if (blueprintId.startsWith(setNo + "_") || library.hasAlternateInSet(blueprintId, setNo))
-                        return true;
+                    if (blueprintId.startsWith(setNo + "_") || library.hasAlternateInSet(blueprintId, String.valueOf(setNo))) {
+                        isInAnySet = true;
+                    }
                 }
             } else {
-                if (blueprintId.startsWith(set + "_") || library.hasAlternateInSet(blueprintId, Integer.parseInt(set)))
-                    return true;
+                if (blueprintId.startsWith(set + "_") || library.hasAlternateInSet(blueprintId, set)) {
+                    isInAnySet = true;
+                }
             }
         }
 
-
-        return false;
+        return isInAnySet;
     }
 
     private List<String> getWords(List<String> params, boolean sanitize) {
@@ -393,7 +414,7 @@ public class SortAndFilterCards {
         return result;
     }
 
-    private static boolean IsFlagAccepted(Boolean filterValue, Boolean blueprintValue) {
+    private static boolean isFlagAccepted(Boolean filterValue, Boolean blueprintValue) {
         if(filterValue == null)
             return true;
 
@@ -403,6 +424,10 @@ public class SortAndFilterCards {
         return filterValue == blueprintValue;
     }
 
+    private static boolean isJSInvalidString(String str) {
+        return str == null || str.isEmpty() || str.equals("null") || str.equals("undefined");
+    }
+
 
     /**
      * Determines if the blueprint attribute value is accepted by the filter comparison.
diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/formats/DefaultLotroFormat.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/formats/DefaultLotroFormat.java
index ca255c545..4663a91f2 100644
--- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/formats/DefaultLotroFormat.java
+++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/formats/DefaultLotroFormat.java
@@ -5,6 +5,7 @@ import com.gempukku.lotro.common.JSONDefs;
 import com.gempukku.lotro.common.Side;
 import com.gempukku.lotro.common.SitesBlock;
 import com.gempukku.lotro.game.*;
+import com.gempukku.lotro.game.packs.SetDefinition;
 import com.gempukku.lotro.logic.GameUtils;
 import com.gempukku.lotro.logic.vo.LotroDeck;
 import org.apache.commons.lang3.StringUtils;
@@ -35,7 +36,7 @@ public class DefaultLotroFormat implements LotroFormat {
     private final List<String> _bannedCards = new ArrayList<>();
     private final List<String> _restrictedCards = new ArrayList<>();
     private final List<String> _validCards = new ArrayList<>();
-    private final List<Integer> _validSets = new ArrayList<>();
+    private final List<String> _validSets = new ArrayList<>();
     private final List<String> _restrictedCardNames = new ArrayList<>();
     private final String _surveyUrl;
     private final boolean _isPlaytest;
@@ -45,6 +46,9 @@ public class DefaultLotroFormat implements LotroFormat {
     private final List<String> _limit3Cards = new ArrayList<>();
     private final Map<String,String> _errataCardMap = new TreeMap<>();
 
+    private final List<String> _blockDefs = new ArrayList<>();
+    private final List<JSONDefs.BlockFilter> _blockFilters = new ArrayList<>();
+
 
     public DefaultLotroFormat(AdventureLibrary adventureLibrary, LotroCardBlueprintLibrary library, JSONDefs.Format def) throws InvalidPropertiesFormatException{
 
@@ -68,8 +72,8 @@ public class DefaultLotroFormat implements LotroFormat {
         _isPlaytest = def.playtest;
         _hallVisible = def.hall;
 
-        if(def.set != null)
-            def.set.forEach(this::addValidSet);
+        if(def.sets != null)
+            def.sets.forEach(this::addValidSet);
         if(def.banned != null)
             def.banned.forEach(this::addBannedCard);
         if(def.restricted != null)
@@ -89,6 +93,58 @@ public class DefaultLotroFormat implements LotroFormat {
         }
         if(def.errata != null)
             def.errata.forEach(this::addCardErrata);
+
+        if(def.blocks != null)
+            this._blockDefs.addAll(def.blocks);
+    }
+
+    @Override
+    public void generateBlockFilter(Map<String, LotroFormat> allFormats, Map<String, SetDefinition> allSets) {
+        try {
+            for (String def : this._blockDefs) {
+                if (def == null || def.isEmpty())
+                    continue;
+
+                var filter = new JSONDefs.BlockFilter();
+
+                var format = allFormats.get(def);
+                if (format != null) {
+                    filter.name = format.getName();
+                    filter.filter = format.getCode();
+                    for (String setId : format.getValidSets()) {
+                        var set = allSets.get(setId);
+                        if (set == null)
+                            continue; // maybe throw?
+
+                        filter.setFilters.put(set.getSetName(), set.getSetId());
+                    }
+                    _blockFilters.add(filter);
+                    continue;
+                }
+
+                //Not a format, so we are splitting apart an ad-hoc definition in the form of:
+                // Additional Sets|Reflections:9,Expanded Middle-earth:14,The Wraith Collection:16
+                String filterList = "";
+
+                var blockInfo = def.split("\\|");
+                filter.name = blockInfo[0];
+
+                var sets = blockInfo[1].split(",");
+                for (String set : sets) {
+                    var setInfo = set.split(":");
+                    filter.setFilters.put(setInfo[0], setInfo[1]);
+
+                    filterList += setInfo[1] + ",";
+                }
+
+                filter.filter =  filterList.substring(0, filterList.length() - 1);
+
+                _blockFilters.add(filter);
+            }
+        }
+        catch(Exception ex) {
+            throw new IllegalArgumentException("Format " + _name + " has invalid block definition.", ex);
+        }
     }
 
     @Override
@@ -157,7 +213,7 @@ public class DefaultLotroFormat implements LotroFormat {
     }
 
     @Override
-    public List<Integer> getValidSets() {
+    public List<String> getValidSets() {
         return Collections.unmodifiableList(_validSets);
     }
 
@@ -248,8 +304,8 @@ public class DefaultLotroFormat implements LotroFormat {
             _validCards.add(baseBlueprintId);
     }
 
-    public void addValidSet(int setNo) {
-        _validSets.add(setNo);
+    public void addValidSet(Integer setNo) {
+        _validSets.add(String.valueOf(setNo));
     }
 
     //Additional Hobbit Draft card lists
@@ -322,7 +378,7 @@ public class DefaultLotroFormat implements LotroFormat {
     }
 
     private boolean isValidInSets(String blueprintId)  {
-        for (int validSet : _validSets)
+        for (String validSet : _validSets)
             if (blueprintId.startsWith(validSet + "_")
                     || _library.hasAlternateInSet(blueprintId, validSet))
                 return true;
@@ -803,7 +859,9 @@ public class DefaultLotroFormat implements LotroFormat {
             maximumSameName = _maximumSameName;
             mulliganRule = _mulliganRule;
             usesMaps = _usesMaps;
-            set = null;
+            sets = null;
+            blocks = null;
+            blockFilters = new ArrayList<>(_blockFilters);
             banned = null;
             restricted = null;
             valid = null;
diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/formats/LotroFormatLibrary.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/formats/LotroFormatLibrary.java
index 7db536cf2..fc509ba9b 100644
--- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/formats/LotroFormatLibrary.java
+++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/formats/LotroFormatLibrary.java
@@ -120,6 +120,11 @@ public class LotroFormatLibrary {
                     _hallFormats.put(format.getCode(), format);
                 }
             }
+
+            for(var format : _hallFormats.values()) {
+                format.generateBlockFilter(_allFormats, _cardLibrary.getSetDefinitions());
+            }
+
             collectionReady.release();
         }
         catch (Exception exp) {