diff --git a/core.lua b/core.lua
index b1da41d..8017b9b 100644
--- a/core.lua
+++ b/core.lua
@@ -22,6 +22,7 @@ Aux = {
 function Aux_OnLoad()
 	Aux.log('Aux v'..AuxVersion..' loaded.')
 	Aux.loaded = true
+    tinsert(UISpecialFrames, 'AuxFrame')
 end
 
 function Aux_OnEvent()
diff --git a/item_search_frame.lua b/item_search_frame.lua
index e4348fa..224861d 100644
--- a/item_search_frame.lua
+++ b/item_search_frame.lua
@@ -517,7 +517,7 @@ function public.start_search()
     local item_info = Aux.info.item(item_id)
 
     local class_index = Aux.item_class_index(item_info.class)
-    local subclass_index = Aux.item_subclass_index(class_index, item_info.subclass)
+    local subclass_index = class_index and Aux.item_subclass_index(class_index, item_info.subclass)
 
 	search_query = {
 		name = item_info.name,