diff --git a/app/views/course/details/index.php b/app/views/course/details/index.php
index d5081810cd8cd3a07a5d7b473dae6fa71ce2526e..3b9d86ccd2526c9a8cb073fbcf2ee4126612fcfc 100644
--- a/app/views/course/details/index.php
+++ b/app/views/course/details/index.php
@@ -363,7 +363,7 @@
     </article>
 <? endif ?>
 
-<? if ($study_areas && count($study_areas) > 0) : ?>
+<? if (!empty($study_areas)) : ?>
     <article class="studip">
         <header>
             <h1><?= _('Studienbereiche') ?></h1>
diff --git a/app/views/study_area/tree.php b/app/views/study_area/tree.php
index 79778bbea40884172e7b359126fa7340ea8e53e6..d3ec538c75084ad5d9b5c4e4fdf15f899a7a1b7d 100644
--- a/app/views/study_area/tree.php
+++ b/app/views/study_area/tree.php
@@ -6,6 +6,7 @@
  * @var array $dont_open
  * @var string $compulsory
  */
+$layer = 0;
 ?>
 <li>
 <? if ($node->id !== 'root' && $node->required_children): ?>
diff --git a/templates/dates/seminar_html_location.php b/templates/dates/seminar_html_location.php
index 1c744441e8984d79c81016e29e719a3c7c147695..faf208a13cb80723fdddfb27f247d97d32c6217e 100644
--- a/templates/dates/seminar_html_location.php
+++ b/templates/dates/seminar_html_location.php
@@ -11,7 +11,7 @@ if (is_array($dates['regular']['turnus_data'])) foreach ($dates['regular']['turn
     if ($cycle['desc'])
         $cycle_output .= ', <i>' . htmlReady($cycle['desc']) . '</i>';
 
-    if ($show_room) :
+    if (!empty($show_room)) :
         $cycle_output .= $this->render_partial('dates/_seminar_rooms', ['assigned' => $cycle['assigned_rooms'],
                                                                         'freetext' => $cycle['freetext_rooms'],
                                                                         'link'     => $link