diff --git a/app/Http/Controllers/ItemController.php b/app/Http/Controllers/ItemController.php
index 57b3ff6..37e8246 100644
--- a/app/Http/Controllers/ItemController.php
+++ b/app/Http/Controllers/ItemController.php
@@ -17,13 +17,15 @@ class ItemController extends Controller
     public function showByEvent($event)
     {
         $eid = Event::where('slug','=',$event)->first()->eid;
-        return response()->json(Item::where('eid','=',$eid)->get());
+        return response()->json(Item::where('eid','=',$eid)
+            ->join('containers','item.cid','=','container.cid')
+            ->leftJoin('files','item.iid','=','files.iid')
+            ->get());
     }
 
     public function searchByEvent($event, $query)
     {
-        $eid = Event::where('slug','=',$event)->first()->eid;
-        return response()->json(Item::where('eid','=',$eid)->get()); //TODO actually search
+        return showByEvent($event); //TODO actually search
     }
 
     public function showOneItem($event, $id)