diff --git a/SpiceQL/db/base.json b/SpiceQL/db/base.json
index 9e40ac2f230d29e2d3319f59062a0c54e2358ee9..d67ae6a32c343bb21081dcb8961db4bdfc606b25 100644
--- a/SpiceQL/db/base.json
+++ b/SpiceQL/db/base.json
@@ -31,6 +31,9 @@
     },
     "deps" : ["/base"]
   },
+  "iau_moon" : {
+    "deps" : ["/moon"]
+  },
   "neptune" : { 
     "tspk" : {
       "noquality": {
diff --git a/SpiceQL/src/spice_types.cpp b/SpiceQL/src/spice_types.cpp
index a9fa046232a0b6a271609f344619b6fd7498e0e4..d38e32bc8448f6c95ef7034c6a3699bff7f27be8 100644
--- a/SpiceQL/src/spice_types.cpp
+++ b/SpiceQL/src/spice_types.cpp
@@ -331,6 +331,7 @@ namespace SpiceQL {
       baseKernels = Inventory::search_for_kernelset("base", {"fk"});
       missionKernels = Inventory::search_for_kernelset(mission, {"fk"});
     }
+    
     KernelSet baseKset(baseKernels);
     KernelSet missionKset(missionKernels);
 
diff --git a/SpiceQL/src/utils.cpp b/SpiceQL/src/utils.cpp
index a9bf76a355100d69fa1e22d9177d7922d26152bd..bdeda7047d10ae4800c6495f694687f000ba8f23 100644
--- a/SpiceQL/src/utils.cpp
+++ b/SpiceQL/src/utils.cpp
@@ -452,19 +452,13 @@ namespace SpiceQL {
     }
 
     json ephemKernels = {};
-    json lskKernels = {};
-    json pckKernels = {};
 
     if (searchKernels) {
-      ephemKernels = Inventory::search_for_kernelsets({mission, "base"}, {"sclk", "ck", "pck", "fk", "tspk", "lsk", "pck", "tspk"}, ets.front(), ets.back(), ckQuality, "noquality");
-      lskKernels = Inventory::search_for_kernelset("base", {"lsk"});
-      pckKernels = Inventory::search_for_kernelset("base", {"pck"});
+      ephemKernels = Inventory::search_for_kernelsets({mission, "base"}, {"sclk", "ck", "pck", "fk", "tspk", "lsk", "tspk"}, ets.front(), ets.back(), ckQuality, "noquality");
     }
 
     auto start = high_resolution_clock::now();
     KernelSet ephemSet(ephemKernels);
-    KernelSet lskSet(lskKernels);
-    KernelSet pckSet(pckKernels);
     auto stop = high_resolution_clock::now();
     auto duration = duration_cast<microseconds>(stop - start);
     SPDLOG_INFO("Time in microseconds to furnish kernel sets: {}", duration.count());