diff --git a/NUSGet.py b/NUSGet.py
index f645df8..ea8140c 100644
--- a/NUSGet.py
+++ b/NUSGet.py
@@ -131,21 +131,18 @@ class MainWindow(QMainWindow, Ui_MainWindow):
                 category = item.parent().parent().parent().text(0)
             except AttributeError:
                 return
-            for tree in self.trees:
-                try:
-                    for title in tree[1][category]:
-                        # Check to see if the current title matches the selected one, and if it does, pass that info on.
-                        if item.parent().parent().text(0) == (title["TID"] + " - " + title["Name"]):
-                            selected_title = title
-                            selected_version = item.text(0)
-                            selected_region = item.parent().text(0)
-                            self.ui.console_select_dropdown.setCurrentIndex(self.ui.platform_tabs.currentIndex())
-                            self.load_title_data(selected_title, selected_version, selected_region)
-                except KeyError:
-                    pass
+            tree = self.trees[self.ui.platform_tabs.currentIndex()]
+            for title in tree[1][category]:
+                # Check to see if the current title matches the selected one, and if it does, pass that info on.
+                if item.parent().parent().text(0) == (title["TID"] + " - " + title["Name"]):
+                    selected_title = title
+                    selected_version = item.text(0)
+                    selected_region = item.parent().text(0)
+                    self.ui.console_select_dropdown.setCurrentIndex(self.ui.platform_tabs.currentIndex())
+                    self.load_title_data(selected_title, selected_version, selected_region)
 
     def update_log_text(self, new_text):
-        # This function primarily exists to be the handler for the progress signal emitted by the worker thread.
+        # This method primarily exists to be the handler for the progress signal emitted by the worker thread.
         self.log_text += new_text + "\n"
         self.ui.log_text_browser.setText(self.log_text)
         # Always auto-scroll to the bottom of the log.
diff --git a/data/vwii-database.json b/data/vwii-database.json
index a3c5d39..e7cae2a 100644
--- a/data/vwii-database.json
+++ b/data/vwii-database.json
@@ -43,18 +43,6 @@
       "Ticket": true,
       "WAD Name": "Mii-Channel-NUS"
     },
-    {
-      "Name": "Region Select",
-      "TID": "0007000848414CXX",
-      "Versions": {
-        "USA/NTSC": [2],
-        "Europe/PAL": [2],
-        "Japan": [2]
-      },
-      "Ticket": true,
-      "WAD Name": "Region-Select-NUS",
-      "Danger": "\"Region Select\" is a hidden channel used during the Wii's initial setup. If this title is damaged or missing, you will not be able to set up your Wii again after a factory reset."
-    },
     {
       "Name": "Shopping Channel",
       "TID": "00070002484142XX",
@@ -84,6 +72,20 @@
       },
       "Ticket": true,
       "WAD Name": "Wii-Electronic-Manual-NUS"
+    }
+  ],
+  "Hidden Channels": [
+        {
+      "Name": "Region Select",
+      "TID": "0007000848414CXX",
+      "Versions": {
+        "USA/NTSC": [2],
+        "Europe/PAL": [2],
+        "Japan": [2]
+      },
+      "Ticket": true,
+      "WAD Name": "Region-Select-NUS",
+      "Danger": "\"Region Select\" is a hidden channel used during the Wii's initial setup. If this title is damaged or missing, you will not be able to set up your Wii again after a factory reset."
     },
     {
       "Name": "Wii System Transfer (WagonCompat)",
diff --git a/data/wii-database.json b/data/wii-database.json
index 2a6d91c..043850c 100644
--- a/data/wii-database.json
+++ b/data/wii-database.json
@@ -20,19 +20,6 @@
       "WAD Name": "boot2-NUS",
       "Danger": "boot2 is a critical part of the Wii's boot process, and should not be modified. Most updated Wiis will already be running boot2v4, which is the only version of boot2 available on the NUS."
     },
-    {
-      "Name": "EULA",
-      "TID": "0001000848414BXX",
-      "Versions": {
-        "USA/NTSC": [1, 2, 3],
-        "Europe/PAL": [1, 2, 3],
-        "Japan": [1, 2, 3],
-        "Korea": [1, 2, 3]
-      },
-      "Ticket": true,
-      "WAD Name": "EULA-NUS",
-      "Danger": "\"EULA\" is a hidden channel used to display the End User License Agreement that must be accepted to connect to WiiConnect24. Online services may not work correctly if this channel is damaged or missing."
-    },
     {
       "Name": "MIOS",
       "TID": "0000000100000101",
@@ -43,19 +30,6 @@
       "WAD Name": "MIOS-NUS",
       "Danger": "MIOS is required for the Wii's backwards compatibility with the GameCube. GameCube games will not run properly if MIOS is damaged or missing."
     },
-    {
-      "Name": "Region Select",
-      "TID": "0001000848414CXX",
-      "Versions": {
-        "USA/NTSC": [1, 2],
-        "Europe/PAL": [1, 2],
-        "Japan": [1, 2],
-        "Korea": [2]
-      },
-      "Ticket": true,
-      "WAD Name": "Region-Select-NUS",
-      "Danger": "\"Region Select\" is a hidden channel used during the Wii's initial setup. If this title is damaged or missing, you will not be able to set up your Wii again after a factory reset. This title will need to be reinstalled to fix your console."
-    },
     {
       "Name": "System Menu",
       "TID": "0000000100000002",
@@ -134,6 +108,43 @@
       "WAD Name": "Shopping-Channel-NUS"
     }
   ],
+  "Hidden Channels": [
+    {
+      "Name": "EULA",
+      "TID": "0001000848414BXX",
+      "Versions": {
+        "USA/NTSC": [1, 2, 3],
+        "Europe/PAL": [1, 2, 3],
+        "Japan": [1, 2, 3],
+        "Korea": [1, 2, 3]
+      },
+      "Ticket": true,
+      "WAD Name": "EULA-NUS",
+      "Danger": "\"EULA\" is a hidden channel used to display the End User License Agreement that must be accepted to connect to WiiConnect24. Online services may not work correctly if this channel is damaged or missing."
+    },
+    {
+      "Name": "Region Select",
+      "TID": "0001000848414CXX",
+      "Versions": {
+        "USA/NTSC": [1, 2],
+        "Europe/PAL": [1, 2],
+        "Japan": [1, 2],
+        "Korea": [2]
+      },
+      "Ticket": true,
+      "WAD Name": "Region-Select-NUS",
+      "Danger": "\"Region Select\" is a hidden channel used during the Wii's initial setup. If this title is damaged or missing, you will not be able to set up your Wii again after a factory reset. This title will need to be reinstalled to fix your console."
+    },
+    {
+      "Name": "Set Personal Data Channel",
+      "TID": "00010008484343XX",
+      "Versions": {
+        "Japan": [0, 1, 2]
+      },
+      "Ticket": true,
+      "WAD Name": "Set-Personal-Data-Channel-NUS"
+    }
+  ],
   "Downloadable Channels": [
     {
       "Name": "Amazon Instant Video",
@@ -273,15 +284,6 @@
       "Ticket": true,
       "WAD Name": "Photo-Channel-1.0-Restore-Program-NUS"
     },
-    {
-      "Name": "Set Personal Data Channel",
-      "TID": "00010008484343XX",
-      "Versions": {
-        "Japan": [0, 1, 2]
-      },
-      "Ticket": true,
-      "WAD Name": "Set-Personal-Data-Channel-NUS"
-    },
     {
       "Name": "The Legend of Zelda: Skyward Sword Save Data Update Channel",
       "TID": "00010001484352XX",