diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
index 84507fb..63a62aa 100644
--- a/.config/dotnet-tools.json
+++ b/.config/dotnet-tools.json
@@ -9,7 +9,7 @@
       ]
     },
     "unofficial.Urho3DNet.Editor": {
-      "version": "0.3.7.832",
+      "version": "0.3.7.837",
       "commands": [
         "rbfx"
       ]
diff --git a/Directory.Build.props b/Directory.Build.props
index fb07e1d..98d2a15 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project>
   <PropertyGroup>
-    <Urho3DNetVersion>0.3.7.832</Urho3DNetVersion>
+    <Urho3DNetVersion>0.3.7.837</Urho3DNetVersion>
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/RbfxTemplate/GameState.cs b/RbfxTemplate/GameState.cs
index 5bdedfb..ab7211f 100644
--- a/RbfxTemplate/GameState.cs
+++ b/RbfxTemplate/GameState.cs
@@ -219,9 +219,9 @@ public Tile CreateTile(string imageName)
             m.SetTexture("Albedo", tex);
 
             var tile = _scene.Ptr.InstantiatePrefab(_tilePrefab);
-            var model = tile.GetComponent<StaticModel>(true);
+            var model = tile.FindComponent<StaticModel>(ComponentSearchFlag.Default);
             model.SetMaterial(m);
-            return tile.GetComponent<Tile>(true);
+            return tile.FindComponent<Tile>(ComponentSearchFlag.Default);
         }
 
         public Ray GetScreenRay(IntVector2 inputMousePosition)
@@ -235,8 +235,7 @@ public Tile PickTile(IntVector2 inputMousePosition)
             var physics = _scene.Ptr.GetComponent<PhysicsWorld>();
             physics.RaycastSingle(_raycastResult, ray, 100);
             if (_raycastResult.Body != null)
-                return _raycastResult.Body.Node.GetComponent<Tile>() ??
-                       _raycastResult.Body.Node.GetParentComponent<Tile>(true);
+                return _raycastResult.Body.Node.FindComponent<Tile>(ComponentSearchFlag.SelfOrParentRecursive);
             return null;
         }
 
diff --git a/RbfxTemplate/GameStates/DragState.cs b/RbfxTemplate/GameStates/DragState.cs
index 32ca25f..afb1031 100644
--- a/RbfxTemplate/GameStates/DragState.cs
+++ b/RbfxTemplate/GameStates/DragState.cs
@@ -58,7 +58,7 @@ public void TrackTile(Tile tile, InteractionKey interactionKey)
             _interactionKey = interactionKey;
             tile.LinkTo(null);
             var material = Context.ResourceCache.GetResource<Material>("Materials/White.material");
-            tile.Link.GetComponent<AnimatedModel>(true).SetMaterial(material);
+            tile.Link.FindComponent<AnimatedModel>(ComponentSearchFlag.Default | ComponentSearchFlag.Disabled).SetMaterial(material);
         }
 
         private void MoveLink(IntVector2 intVector2)