diff --git a/apps/main/templates/operation.html b/apps/main/templates/operation.html
index e288a18..53f0b72 100644
--- a/apps/main/templates/operation.html
+++ b/apps/main/templates/operation.html
@@ -47,25 +47,27 @@
 	      </h4>
 	    </div>
 	    
-	    <div id="collapseTwo-{{ location.name }}" class="panel-collapse collapse in" role="tabpanel" aria-labelledby="headingTwo">
+	    <div id="collapseTwo-{{ location.id }}" class="panel-collapse collapse in" role="tabpanel" aria-labelledby="headingTwo">
 	      <div class="panel-body">
 	      <table class="table table-hover">
 			<tr>
-			  <th>#</th>
+			  
 			  {% for header in experiment_keys %}
 			  <th>{{ header|title }}</th>
 			  {% endfor%}
 			</tr>
 			
 			{% for item in experiments %}
-				{% if location.name in item.location.name  %}
-					<tr class="clickable-row" data-href="{% url 'url_experiment' item.id %}" >
-						<td>{{ forloop.counter }}</td>
+				{% for exs in item %}
+					<tr class="clickable-row" data-href="{% url 'url_experiment' exs.id %}" >
+						
 			        	{% for key in experiment_keys %}
-			              <td>{{ item|value:key }}</td>
+			        	    {% if location.name in exs.location.name  %}
+			              <td>{{ exs|value:key }}</td>
+			       		    {% endif %}
 			       		{% endfor %}
+			     {% endfor %}
 					</tr>
-				{% endif %}
 			{% endfor %}
 		  </table>  
 	      </div>
diff --git a/apps/main/views.py b/apps/main/views.py
index 3e41dc4..dfa8ef6 100644
--- a/apps/main/views.py
+++ b/apps/main/views.py
@@ -776,8 +776,9 @@ def operation(request, id_camp=None):
         if form.is_valid():
             return redirect('url_operation', id_camp=campaign.id)
     
-    locations = Location.objects.filter(experiment__campaign = campaign)
+    locations = Location.objects.filter(experiment__campaign__pk = campaign.id)
     experiments = Experiment.objects.filter(campaign=campaign)
+    experiments = [Experiment.objects.filter(location__pk=location.id) for location in locations]
     
     kwargs = {}
     #---Campaign