diff --git a/source/net/sourceforge/filebot/ui/HistoryPanel.java b/source/net/sourceforge/filebot/ui/HistoryPanel.java
index fd7c47f4..b100dd38 100644
--- a/source/net/sourceforge/filebot/ui/HistoryPanel.java
+++ b/source/net/sourceforge/filebot/ui/HistoryPanel.java
@@ -32,14 +32,27 @@ public class HistoryPanel extends JPanel {
 	}
 	
 
-	protected void setupHeader() {
+	private void setupHeader() {
 		for (int i = 0; i < 3; i++) {
 			JLabel columnHeader = new JLabel();
 			
 			columnHeader.setFont(columnHeader.getFont().deriveFont(Font.BOLD));
 			
 			columnHeaders.add(columnHeader);
-			add(columnHeader, (i == 0) ? "align left, gapbefore 20" : "align right, gapafter 20");
+			
+			add(columnHeader, getHeaderConstraint(i));
+		}
+	}
+	
+
+	private String getHeaderConstraint(int headerIndex) {
+		switch (headerIndex) {
+			case 0:
+				return "align left, gapbefore 24";
+			case 1:
+				return "align center";
+			default:
+				return "align right, gapafter 12";
 		}
 	}
 	
diff --git a/source/net/sourceforge/filebot/web/TVRageClient.java b/source/net/sourceforge/filebot/web/TVRageClient.java
index 235368ad..412fcfc1 100644
--- a/source/net/sourceforge/filebot/web/TVRageClient.java
+++ b/source/net/sourceforge/filebot/web/TVRageClient.java
@@ -138,14 +138,14 @@ public class TVRageClient implements EpisodeListClient {
 		
 		private final int totalSeasons;
 		
-		private final Node episodeListNode;
+		private final Document feed;
 		
 		
-		public EpisodeListFeed(Document dom) {
-			name = XPathUtil.selectString("Show/name", dom);
-			totalSeasons = XPathUtil.selectInteger("Show/totalseasons", dom);
+		public EpisodeListFeed(Document feed) {
+			name = XPathUtil.selectString("Show/name", feed);
+			totalSeasons = XPathUtil.selectInteger("Show/totalseasons", feed);
 			
-			episodeListNode = XPathUtil.selectNode("Show/Episodelist", dom);
+			this.feed = feed;
 		}
 		
 
@@ -172,9 +172,9 @@ public class TVRageClient implements EpisodeListClient {
 
 		public List<Episode> getEpisodeList(int season) {
 			if (season > getTotalSeasons() || season < 0)
-				throw new IllegalArgumentException(String.format("%s only has %d seasons", getName(), getTotalSeasons()));
+				throw new IllegalArgumentException(String.format("%s only has %d seasons.", getName(), getTotalSeasons()));
 			
-			List<Node> nodes = XPathUtil.selectNodes("Season[@no='" + season + "']/episode", episodeListNode);
+			List<Node> nodes = XPathUtil.selectNodes("//Season[@no='" + season + "']/episode", feed);
 			
 			List<Episode> episodes = new ArrayList<Episode>(nodes.size());
 			String numberOfSeason = Integer.toString(season);