diff --git a/plugins/mezuro/controllers/myprofile/mezuro_plugin_range_controller.rb b/plugins/mezuro/controllers/myprofile/mezuro_plugin_range_controller.rb
index 255b89c..cae2b1b 100644
--- a/plugins/mezuro/controllers/myprofile/mezuro_plugin_range_controller.rb
+++ b/plugins/mezuro/controllers/myprofile/mezuro_plugin_range_controller.rb
@@ -9,9 +9,11 @@ class MezuroPluginRangeController < MezuroPluginMyprofileController
   end
 
   def edit_range
-    @range = Kalibro::Range.new(params[:range])
     @content_id = params[:id]
     @metric_configuration_id = params[:metric_configuration_id]
+    ranges = Kalibro::Range.ranges_of params[:metric_configuration_id]
+    @range = (ranges.select { |range| range.id == params[:range_id].to_i }).first
+    @reading_labels_and_ids = reading_labels_and_ids
   end
 
   def create_range
@@ -35,11 +37,12 @@ class MezuroPluginRangeController < MezuroPluginMyprofileController
   def remove_range
     configuration_content_id = params[:id]
     metric_configuration_id = params[:metric_configuration_id]
-    Kalibro::Range.new(params[:range]).destroy
-    if metric_configuration.metric.compound
-      redirect_to "/myprofile/#{profile.identifier}/plugin/mezuro/metric_configuration/edit_compound_metric_configuration?id=#{configuration_content_id}&metric_configuration_id=#{metric_configuration_id}"
+    compound = params[:compound]
+    Kalibro::Range.new({:id => params[:range_id]}).destroy
+    if compound
+      redirect_to "/myprofile/#{profile.identifier}/plugin/mezuro/metric_configuration/edit_compound?id=#{configuration_content_id}&metric_configuration_id=#{metric_configuration_id}"
     else
-      redirect_to "/myprofile/#{profile.identifier}/plugin/mezuro/metric_configuration/edit_native_metric_configuration?id=#{configuration_content_id}&metric_configuration_id=#{metric_configuration_id}"
+      redirect_to "/myprofile/#{profile.identifier}/plugin/mezuro/metric_configuration/edit_native?id=#{configuration_content_id}&metric_configuration_id=#{metric_configuration_id}"
     end
   end
 
diff --git a/plugins/mezuro/views/mezuro_plugin_metric_configuration/edit_native.html.erb b/plugins/mezuro/views/mezuro_plugin_metric_configuration/edit_native.html.erb
index 8cd04e0..ba059b2 100644
--- a/plugins/mezuro/views/mezuro_plugin_metric_configuration/edit_native.html.erb
+++ b/plugins/mezuro/views/mezuro_plugin_metric_configuration/edit_native.html.erb
@@ -36,7 +36,7 @@
   </tr>
   <% @ranges.each do |range| %>
       <%= render :partial => "mezuro_plugin_range/range", :locals => {:range => range, :id => @configuration_content.id, 
-          :metric_configuration_id => @metric_configuration.id} %>
+          :metric_configuration_id => @metric_configuration.id, :reading_group_id => @metric_configuration.reading_group_id, :compound => @metric_configuration.metric.compound} %>
   <% end %>
 </table>
 
diff --git a/plugins/mezuro/views/mezuro_plugin_range/_range.html.erb b/plugins/mezuro/views/mezuro_plugin_range/_range.html.erb
index e1fe7d1..7f99077 100644
--- a/plugins/mezuro/views/mezuro_plugin_range/_range.html.erb
+++ b/plugins/mezuro/views/mezuro_plugin_range/_range.html.erb
@@ -13,9 +13,9 @@
   </td>
   <td bgcolor="#<%= range.color %>"></td>
   <% if (not user.nil?) && user.id == @profile.id %>
-  <td><%= link_to_remote "Edit", :url => {:action =>"edit_range", :controller => "mezuro_plugin_range", :id => params[:id], :metric_configuration_id => params[:metric_configuration_id], :range_id => range.id} %>
+  <td><%= link_to_remote "Edit", :url => {:action =>"edit_range", :controller => "mezuro_plugin_range", :id => params[:id], :metric_configuration_id => params[:metric_configuration_id], :range_id => range.id, :reading_group_id => reading_group_id} %>
   </td>
-    <td><%= link_to "Remove", :action =>"remove_range", :controller => "mezuro_plugin_range", :id => params[:id], :metric_configuration_id => params[:metric_configuration_id], :range_id => range.id %>
+    <td><%= link_to "Remove", :action =>"remove_range", :controller => "mezuro_plugin_range", :id => params[:id], :metric_configuration_id => params[:metric_configuration_id], :range_id => range.id, :compound => compound %>
     </td>
   <% else %>
     <td></td>
--
libgit2 0.21.2