diff --git a/roofis2/roomservice/urls.py b/roofis2/roomservice/urls.py
index 8a0dacc..003cdfd 100644
--- a/roofis2/roomservice/urls.py
+++ b/roofis2/roomservice/urls.py
@@ -10,8 +10,7 @@ urlpatterns = [
     path('success/', views.success, name='success'),
 
     path('adminpage', views.admin, name='admin'),
-    path('booking', views.booking, name='booking'),
+    path('booking/<int:id>', views.booking, name='booking'),
     path('search', views.search, name='search'),
     path('location_search', views.location_based_search, name='location-based-search'),
     path('filter_search', views.filter_search, name='filter-search')]
-
diff --git a/roofis2/roomservice/views.py b/roofis2/roomservice/views.py
index 64a7553..4f8c502 100644
--- a/roofis2/roomservice/views.py
+++ b/roofis2/roomservice/views.py
@@ -49,9 +49,8 @@ def search(request):
         return render(request, 'search.jinja', {"title": "rooF(i)S is love rooF(i)S is live!!", "rooms": rooms})
 
 
-def booking(request):
-    room_id = request.POST["room"]
-    return render(request, 'booking.jinja', {"title": "rooF(i)S is love rooF(i)S is live!!", "data": room_id})
+def booking(request, id):
+    return render(request, 'booking.jinja', {"title": "rooF(i)S is love rooF(i)S is live!!", "data": id})
 
 
 def admin(request):
diff --git a/roofis2/templates/search.jinja b/roofis2/templates/search.jinja
index a9be85c..3ff73de 100644
--- a/roofis2/templates/search.jinja
+++ b/roofis2/templates/search.jinja
@@ -66,30 +66,32 @@
                 {#                </form>#}
             </div>
         </div>
-        <div class="row">
-            <div class="col-12">
-                <h2>Results</h2>
-            </div>
-        </div>
-        <div class="row">
-            {% for room in rooms %}
-                <div class="col-6">
-                    <div class="card" style="width: 18rem;">
-                        <div class="card-body">
-                            <h5 class="card-title">Room:{{ room.room_number }}</h5>
-                            <h6 class="card-subtitle mb-2 text-muted">Building Name: {{ room.building.name }}</h6>
-                            <div class="card-text">
-                                <p>Capacity: {{ room.capacity }} Persons</p>
-                                <p>Room type: {{ room.room_type.type }}</p></div>
-                            <a href="#" class="card-link">Detail</a>
-                            <a href="#" class="card-link">Another link</a>
-                        </div>
-                    </div>
-                    <p></p></br>
+        {% if rooms %}
+            <div class="row">
+                <div class="col-12">
+                    <h2>Results</h2>
                 </div>
-            {% endfor %}
-            <p>Results: {{ result_count }}</p>
-        </div>
+            </div>
+            <div class="row">
+                {% for room in rooms %}
+                    <div class="col-6">
+                        <div class="card" style="width: 18rem;">
+                            <div class="card-body">
+                                <h5 class="card-title">Room:{{ room.room_number }}</h5>
+                                <h6 class="card-subtitle mb-2 text-muted">Building Name: {{ room.building.name }}</h6>
+                                <div class="card-text">
+                                    <p>Capacity: {{ room.capacity }} Persons</p>
+                                    <p>Room type: {{ room.room_type.type }}</p></div>
+                                <a href="{{ url('roomservice:booking', args=[room.id]) }}" class="card-link">Detail</a>
+                                <a href="#" class="card-link">Another link</a>
+                            </div>
+                        </div>
+                        <p></p></br>
+                    </div>
+                {% endfor %}
+                <p>Results: {{ result_count }}</p>
+            </div>
+        {% endif %}
     </div>
 {% endblock %}