diff --git a/resources/[carscripts]/mh_garage/client/main.lua b/resources/[carscripts]/mh_garage/client/main.lua
index 7e8e24300..8f9bda9a4 100644
--- a/resources/[carscripts]/mh_garage/client/main.lua
+++ b/resources/[carscripts]/mh_garage/client/main.lua
@@ -124,7 +124,7 @@ function AddTargetOptions()
         {
             type = "client",
             event = "mh_garage:retrieveVehicle",
-            icon = "fas fa-car",
+            icon = "key",
             label = "Schlüssel Fahrzeug ausparken",
         }
     }
diff --git a/resources/[carscripts]/mh_garage/client/retrieve.lua b/resources/[carscripts]/mh_garage/client/retrieve.lua
index 48cd83ad2..595294e6d 100644
--- a/resources/[carscripts]/mh_garage/client/retrieve.lua
+++ b/resources/[carscripts]/mh_garage/client/retrieve.lua
@@ -24,7 +24,14 @@ AddEventHandler('mh_garage:retrieveOwnerVehicle', function()
                 end
             })
         end
-    end)
+        lib.registerContext({
+            id = "retrieveVehicle",
+            title = random.name,
+            options = opt
+        })
+
+        lib.showContext("retrieveVehicle")
+    end, CurrentZone.name)
 end)
 
 RegisterNetEvent('mh_garage:retrieveVehicle')
@@ -36,7 +43,11 @@ AddEventHandler('mh_garage:retrieveVehicle', function()
     local opt = {}
 
     QBCore.Functions.TriggerCallback('mh_garage:retrieveKeyVehicle', function(cb)
-        Debug(json.encode(cb))
+        if cb == false then
+            Notification("Es ist kein Fahrzeug hier!", "inform")
+            return
+        end
+
         for i = 1, #cb, 1 do
             if cb[i].garage ~= "OUT" then
                 local mods = json.decode(cb[i].mods)
diff --git a/resources/[carscripts]/mh_garage/client/stored.lua b/resources/[carscripts]/mh_garage/client/stored.lua
index d0689d229..d52641efe 100644
--- a/resources/[carscripts]/mh_garage/client/stored.lua
+++ b/resources/[carscripts]/mh_garage/client/stored.lua
@@ -9,7 +9,7 @@ AddEventHandler('mh_garage:storeVehicle', function()
     for i = 1, #vehicles, 1 do
         local veh_coords = GetEntityCoords(vehicles[i])
         local distance = #(veh_coords - coords)
-        if distance < 10.0 then
+        if distance < 15.0 then
             local mods = QBCore.Functions.GetVehicleProperties(vehicles[i])
             local lc_fuelLevel = exports["lc_fuel"]:GetFuel(vehicles[i]) -- Get the fuel level
 
diff --git a/resources/[carscripts]/mh_garage/server/server.lua b/resources/[carscripts]/mh_garage/server/server.lua
index 9b1b74e82..5b0fe9bf2 100644
--- a/resources/[carscripts]/mh_garage/server/server.lua
+++ b/resources/[carscripts]/mh_garage/server/server.lua
@@ -83,7 +83,7 @@ QBCore.Functions.CreateCallback('mh_garage:retrieveOwnerVehicle', function(sourc
     local pedid = Player.PlayerData.citizenid
     local veh = {}
     
-    MySQL.query("SELECT * FROM player_vehicles WHERE owner = ? and garage = ?", {pedid, zone}, function(rs)
+    MySQL.query("SELECT * FROM player_vehicles WHERE citizenid = ? and garage = ?", {pedid, zone}, function(rs)
         if rs ~= nil and rs[1] ~= nil then
             for k, v in pairs (rs) do
                 table.insert(veh, {
@@ -107,7 +107,7 @@ QBCore.Functions.CreateCallback('mh_garage:retrieveKeyVehicle', function(source,
     local pedid = Player.PlayerData.citizenid
     local veh = {}
     
-    MySQL.query("SELECT pv.* FROM player_vehicles pv JOIN vehicle_keys vk ON pv.plate = vk.plate WHERE vk.owner = ? AND vk.count > 0", {playerId}, function(vehicles)
+    MySQL.query("SELECT pv.* FROM player_vehicles pv JOIN vehicle_keys vk ON pv.plate = vk.plate WHERE vk.owner = ? AND vk.count > 0 AND pv.garage = ?", {pedid, zone}, function(vehicles)
     if vehicles and #vehicles > 0 then
         for _, vehicle in pairs(vehicles) do
             table.insert(veh, {