diff --git a/AKPlan/templates/AKPlan/encode_rooms.html b/AKPlan/templates/AKPlan/encode_rooms.html
index 55138df0ead3d3db7b6959fe7be72684147baf74..69574e9264c01d85127bae8a0cf7c0f81229b5f9 100644
--- a/AKPlan/templates/AKPlan/encode_rooms.html
+++ b/AKPlan/templates/AKPlan/encode_rooms.html
@@ -3,7 +3,7 @@
         {
             'id': '{{ room.title }}',
             'title': '{{ room.title }}',
-            'parentId': '{{ room.building }}',
+            'parentId': '{{ room.location }}',
         },
     {% endfor %}
     {% for building in buildings %}
diff --git a/AKPlan/templates/AKPlan/slots_table.html b/AKPlan/templates/AKPlan/slots_table.html
index cb246dbd7c57c5e99fb20c0858b6df8299f7a2ed..93d8ba1221eca3d2ff61a7b054fc3a5bead329cd 100644
--- a/AKPlan/templates/AKPlan/slots_table.html
+++ b/AKPlan/templates/AKPlan/slots_table.html
@@ -6,7 +6,9 @@
     <tr>
         <td><b><a href="{% url 'submit:ak_detail' event_slug=event.slug pk=akslot.ak.pk %}">{{ akslot.ak.name }}</a></b></td>
         <td>{{ akslot.start | time:"H:i" }} - {{ akslot.end | time:"H:i" }}</td>
-        <td>{{ akslot.room }}</td>
+        <td>{% if akslot.room and akslot.room.pk != '' %}
+            <a href="{% url 'plan:plan_room' event_slug=event.slug pk=akslot.room.pk %}">{{ akslot.room }}</a>
+        {% endif %}</td>
     </tr>
     {% empty %}
         {% trans "No AKs" %}