diff --git a/src/main/java/com/CDPrintable/ProgramWindow.java b/src/main/java/com/CDPrintable/ProgramWindow.java
index 14ad581..e4f569a 100644
--- a/src/main/java/com/CDPrintable/ProgramWindow.java
+++ b/src/main/java/com/CDPrintable/ProgramWindow.java
@@ -130,7 +130,7 @@ private JPanel searchPanel() {
         trackListPanel.setBorder(BorderFactory.createTitledBorder("Search Results"));
 
         // Search table set up
-        JTable searchTable = new JTable(getTableModel("CDStub"));
+        JTable searchTable = new JTable(getTableModel("Release"));
         searchTable.addMouseListener(new MouseAdapter() {
             @Override
             public void mouseClicked(MouseEvent e) {
@@ -156,7 +156,12 @@ public void mouseClicked(MouseEvent e) {
         JTextField artistField = new JTextField(15);
 
         // Search type combo box setup
-        JComboBox<String> searchTypeComboBox = new JComboBox<>(new String[] {"CDStub", "Artist", "Release"});
+        JComboBox<String> searchTypeComboBox = new JComboBox<>(new String[] {"Release", "Artist", "CDStub"});
+        searchTypeComboBox.addActionListener(_ -> {
+            if (searchTypeComboBox.getSelectedItem() != null && searchTypeComboBox.getSelectedItem().equals("CDStub")) {
+                JOptionPane.showMessageDialog(null, "CDStubs do not have track numbers. Because of this, they will all be shown as track 0.", "Warning", JOptionPane.WARNING_MESSAGE);
+            }
+        });
 
         // Search button and event listener setup
         JButton searchButton = new JButton("Search");
diff --git a/src/main/resources/version.properties b/src/main/resources/version.properties
index 3fd8e62..e4f25bd 100644
--- a/src/main/resources/version.properties
+++ b/src/main/resources/version.properties
@@ -1,4 +1,4 @@
 # Application version.
 
 # MAJOR MINOR PATCH
-version=2.2.1
\ No newline at end of file
+version=2.2.2
\ No newline at end of file