diff --git a/topologie/templates/topologie/index_p.html b/topologie/templates/topologie/index_p.html
index 56177a06..f44a48c6 100644
--- a/topologie/templates/topologie/index_p.html
+++ b/topologie/templates/topologie/index_p.html
@@ -30,7 +30,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 {% block title %}{% trans "Topology" %}{% endblock %}
 
 {% block content %}
-<h2>{% trans "Switch:"%} {{ nom_switch }}</h2>
+<h2>{% trans "Switch:"%} {{ switch }}</h2>
 <table class="table table-striped">
     <thead>
         <tr>
@@ -40,9 +40,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
         </tr>
     </thead>
     <tr>
-        <td>{{ switch_bay }}</td>
-        <td>{{ switch_model }}</td>
-        <td>{{ switch_stack }}</td>
+        <td>{{ switch.switchbay }}</td>
+        <td>{{ switch.model }}</td>
+        <td>{{ switch.stack }}</td>
     </tr>
 </table>
 <hr>
diff --git a/topologie/views.py b/topologie/views.py
index 41cf5dfd..3d8a3044 100644
--- a/topologie/views.py
+++ b/topologie/views.py
@@ -189,10 +189,7 @@ def index_port(request, switch, switchid):
         {
             'port_list': port_list,
             'id_switch': switchid,
-            'nom_switch': switch,
-            'switch_bay': switch.switchbay,
-            'switch_model': switch.model,
-            'switch_stack': switch.stack
+            'switch': switch
         }
     )