diff --git a/data/images.php b/data/images.php
index 2e8f01c..1d1fc2f 100644
--- a/data/images.php
+++ b/data/images.php
@@ -2,7 +2,7 @@
 
 $images = [
     ["file" => "01.jpg", "label" => "Kmen stromu", "keywords" => ["strom", "příroda"]],
-    ["file" => "02.jpg", "label" => "Mýtina v lese", "keywords" => ["les", "tráva"]],
+    ["file" => "02.jpg", "label" => "Mýtina v lese", "keywords" => ["strom", "les", "tráva"]],
     ["file" => "03.jpg", "label" => "", "keywords" => []],
     ["file" => "04.jpg", "label" => "", "keywords" => []],
     ["file" => "05.jpg", "label" => "Hlava s culíkem", "keywords" => ["vlasy", "cop"]],
diff --git a/include/gallery.php b/include/gallery.php
index f76d47c..524b58c 100644
--- a/include/gallery.php
+++ b/include/gallery.php
@@ -1,30 +1,6 @@
 <?php
 
 require "data/images.php";
+include "include/tiles.php";
 
 ?>
-<div class="row row-cols-md-6 row-cols-3">
-<?php
-foreach ($images as $image) {
-?>
-<div class="col">
-    <div class="card mb-3">
-        <img src="/static/images/thumbs/thumb_<?php echo $image["file"]; ?>" class="card-img-top" alt="...">
-        <div class="card-body">
-            <p class="card-text">
-                <?php
-                if ($image["label"]) {
-                    echo $image["label"];
-                }
-                else {
-                    echo $image["file"];
-                }
-                ?>
-            </p>
-        </div>
-    </div>
-</div>
-<?php
-}
-?>
-</div>
diff --git a/include/search.php b/include/search.php
index 1aef8c2..b02f224 100644
--- a/include/search.php
+++ b/include/search.php
@@ -2,6 +2,7 @@
 
 if (isset($_GET["needle"])) {
     $needle = strtolower($_GET["needle"]);
+    $needle = trim($needle);
     echo "<p>Hledaný výraz: <b>" . $needle . "</b></p>";
 }
 else {
@@ -9,4 +10,17 @@ else {
     $needle = "";
 }
 
+require "data/images.php";
+
+$new_images = [];
+foreach ($images as $image) {
+    // kontrola, zda je hledaný je v poli keywords
+    if (in_array($needle, $image['keywords'])) {
+        $new_images[] = $image;
+    }
+}
+
+// var_dump($new_images);
+$images = $new_images;
+include "include/tiles.php";
 ?>
diff --git a/include/tiles.php b/include/tiles.php
new file mode 100644
index 0000000..effe6fc
--- /dev/null
+++ b/include/tiles.php
@@ -0,0 +1,25 @@
+<div class="row row-cols-md-6 row-cols-3">
+<?php
+foreach ($images as $image) {
+?>
+<div class="col">
+    <div class="card mb-3">
+        <img src="/static/images/thumbs/thumb_<?php echo $image["file"]; ?>" class="card-img-top" alt="...">
+        <div class="card-body">
+            <p class="card-text">
+                <?php
+                if ($image["label"]) {
+                    echo $image["label"];
+                }
+                else {
+                    echo $image["file"];
+                }
+                ?>
+            </p>
+        </div>
+    </div>
+</div>
+<?php
+}
+?>
+</div>