diff --git a/server/fetch.php b/server/fetch.php
index 9a473bc..06383bb 100644
--- a/server/fetch.php
+++ b/server/fetch.php
@@ -44,10 +44,10 @@ function make_login_request($username, $password) {
 }
 
 function parse_teacher($onmouseover) {
-    if ($onmouseover == null) {
-        $onmouseover = "Učitel:~ ~";
+    if (explode("Učitel:", $onmouseover)[0] == $onmouseover) { // neni ucitel
+        $onmouseover = " Učitel:~ ~ ";
     }
-    $explode_on_teacher = explode("Učitel:", $onmouseover); // [0] => something, [1] => teacher and something, 0 can be ignored
+    $explode_on_teacher = explode("Učitel:", $onmouseover); // [0] => something, [1] => teacher and something, 0 can be ignored 
     $explode_on_first_tilda = explode("~", $explode_on_teacher[1]);
     $explode_on_second_tilda = explode("~", $explode_on_first_tilda[1]);
     $teacher = $explode_on_second_tilda[0];
@@ -85,14 +85,15 @@ function parse_cell($cell, $cell_counter, $times) {
     if (!$is_empty && $cell->filter("table")->filter(".KuvSuplovanaHodina")->count() == 0) {
         $name = $cell->filter(".KuvBunkaRozvrhNadpis")->first()->text();
         $maybe_place = $cell->filter(".KuvBunkaRozvrhText")->first()->html();
-        if ($maybe_place == null) {
-            $maybe_place = "<br>";
+        if (strstr($maybe_place, "<br>") == null) {
+            $maybe_place = " <br> ";
         }
         $place = explode("<br>", $maybe_place)[1];
-        if ($place == null) {
+        if ($place == " ") {
             $place = "";
         }
         $teacher = parse_teacher($cell->filter("table")->filter("td")->first()->attr("onmouseover"));
+        if ($teacher == " ") $teacher = "";
         $is_substitute = parse_substitute($cell->filter(".KuvSuplujiciHodina"));
         $number = $cell_counter;
         $start = get_time($times, $cell_counter)[0]; // gives [start, end]
@@ -233,4 +234,3 @@ if (!isset($_POST["username"]) || !isset($_POST["password"])) {
 }
 
 ?>
-