diff --git a/src/ClassCodeBundle/Controller/StructureController.php b/src/ClassCodeBundle/Controller/StructureController.php
index db6b7662e256387e814025285d2350ac0abe7c7f..2dea6dba91e025680a0ff5e02b89661e0fd3d062 100644
--- a/src/ClassCodeBundle/Controller/StructureController.php
+++ b/src/ClassCodeBundle/Controller/StructureController.php
@@ -35,9 +35,15 @@ class StructureController extends Controller
   public function structureMapAction(Request $request)
   {
     $em = $this->getDoctrine()->getManager();
-    $structures =  $em->getRepository('ClassCodeBundle:Structure')->findAll();
-   
-     
+    $type = $request->query->get('type');
+    if(!$type){
+      $structures =  $em->getRepository('ClassCodeBundle:Structure')->findAll();  
+    }else{      
+      $structures =  $em->getRepository('ClassCodeBundle:Structure')->findby(
+        array('mainType' => $type)
+      );
+    }
+  
     $format = $request->getRequestFormat(); 
     
     return $this->render('@ClassCode/Structure/listAll.'.$format.'.twig', array(
diff --git a/src/ClassCodeBundle/Resources/views/Structure/listAll.html.twig b/src/ClassCodeBundle/Resources/views/Structure/listAll.html.twig
index 39ad35806637bd22516b42eb88464c1b921c8a03..3cb59661e425f7c923d1b6db4c7d6f25a53530d5 100644
--- a/src/ClassCodeBundle/Resources/views/Structure/listAll.html.twig
+++ b/src/ClassCodeBundle/Resources/views/Structure/listAll.html.twig
@@ -90,6 +90,8 @@
       var lon;
       var structureArrayMarker = [];
       var structureContentString = '';
+      
+      
       {% for structure in structures %} 
         lat = "{{ structure.getLatitude }}" ;
         lon = "{{ structure.getLongitude }}" ;
@@ -122,6 +124,8 @@
           structureArrayMarker[{{ loop.index0 }}].on('click',function(event){clickMarker(this,structureMap);});     
         }
       {% endfor %}
+      
+      
       structureMap.addLayer(markers);
       L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
         maxZoom: 18,