diff --git a/app/controllers/quantities_controller.rb b/app/controllers/quantities_controller.rb
index c401f29..39609d7 100644
--- a/app/controllers/quantities_controller.rb
+++ b/app/controllers/quantities_controller.rb
@@ -6,7 +6,7 @@ class QuantitiesController < ApplicationController
 
   def index
     @quantity = @project.quantities.new
-    @quantity.domain = Quantity.domains[session[:q_filters][:domain]]
+    @quantity.domain = Quantity.domains[session[:q_filters][:domain]] || @quantity.domain
     prepare_quantities
   end
 
diff --git a/app/helpers/quantities_helper.rb b/app/helpers/quantities_helper.rb
index 918e2e0..cee9a01 100644
--- a/app/helpers/quantities_helper.rb
+++ b/app/helpers/quantities_helper.rb
@@ -11,9 +11,8 @@ module QuantitiesHelper
   end
 
   def parent_options(domain)
-    options = nested_set_options(@quantities.send(domain), @quantity) do |i|
+    options = nested_set_options(@project.quantities.send(domain), @quantity) do |i|
       raw("#{'&ensp;' * i.level}#{i.name}")
     end
-    options.unshift([t('.null_parent'), nil])
   end
 end
diff --git a/app/models/quantity.rb b/app/models/quantity.rb
index 2124ae4..cfdec64 100644
--- a/app/models/quantity.rb
+++ b/app/models/quantity.rb
@@ -19,6 +19,7 @@ class Quantity < ActiveRecord::Base
 
   after_initialize do
     if new_record?
+      self.domain ||= :diet
       self.primary = false if self.primary.nil?
     end
   end
diff --git a/app/views/quantities/_form.html.erb b/app/views/quantities/_form.html.erb
index 6a2c54c..3ce05ce 100644
--- a/app/views/quantities/_form.html.erb
+++ b/app/views/quantities/_form.html.erb
@@ -1,11 +1,12 @@
 <%= error_messages_for @quantity %>
 
 <div class="box tabular">
-  <p><%= f.select :domain, domain_options, required: true %></p>
+  <p><%= f.select :domain, domain_options, {required: true} %></p>
   <% Quantity.domains.each_key do |d| %>
-    <div id="parent_select_<%= d %>" style="display: none">
-      <p><%= f.select :parent_id, parent_options(d),
-        {required: true, label: :field_parent_quantity} %></p>
+    <div id="parent_select_<%= d %>" <%= 'style=display:none;' if @quantity.domain != d %>>
+      <p><%= f.select :parent_id, parent_options(d), {required: true,
+                                                      label: :field_parent_quantity,
+                                                      include_blank: t('.null_parent')} %></p>
     </div>
   <% end %>
   <p><%= f.text_field :name, size: 25, required: true %></p>
@@ -17,15 +18,17 @@
 
 <%= javascript_tag do %>
   function domainChange() {
-    $('[id^=parent_select_]').prop('disabled', true).hide();
-    $('[id^=parent_select_] select').attr('name', 'placeholder');
-    $('[id=parent_select_'+$('#quantity_domain option:selected').val()+']')
-      .prop('disabled', false).show();
-    $('[id=parent_select_'+$('#quantity_domain option:selected').val()+'] select')
+    box = $(this).closest('div');
+    box.find('[id^=parent_select_]').prop('disabled', true).hide();
+    box.find('[id^=parent_select_] select').attr('name', 'placeholder');
+    domain = $(this).val();
+    box.find('[id=parent_select_'+domain+']').prop('disabled', false).show();
+    box.find('[id=parent_select_'+domain+'] select')
       .attr('name', 'quantity[parent_id]');
   }
-  $('#quantity-form').on('change', '#quantity_domain', domainChange);
+  $('form').on('change', '#quantity_domain', domainChange);
 
+  //Firefox does not emit 'change' signal when preserving form over reload
   $(document).ready(function() {
     domainChange();
   });
diff --git a/app/views/quantities/_index.html.erb b/app/views/quantities/_index.html.erb
index b639057..9cc3b20 100644
--- a/app/views/quantities/_index.html.erb
+++ b/app/views/quantities/_index.html.erb
@@ -72,7 +72,8 @@
                 <%=
                   link_to l(:button_cancel), "#",
                     onclick: '$(this).closest("tr").remove();
-                    $("#quantities a.icon-edit").css("visibility", "visible");'
+                    $("#quantities a.icon-edit").css("visibility", "visible");
+                    return false;'
                 %>
               <% end %>
             </div>
diff --git a/app/views/quantities/index.html.erb b/app/views/quantities/index.html.erb
index 18448df..3069093 100644
--- a/app/views/quantities/index.html.erb
+++ b/app/views/quantities/index.html.erb
@@ -14,10 +14,10 @@
 
   <%= labelled_form_for @quantity,
                         :url => project_quantities_path(@project),
-                        :html => {:id => 'quantity-form'} do |f| %>
+                        :html => {:id => 'quantity-add-form'} do |f| %>
     <%= render :partial => 'quantities/form', :locals => { :f => f } %>
     <%= submit_tag l(:button_create) %>
-    <%= link_to l(:button_cancel), "#", :onclick => '$("#add-quantity").hide()' %>
+    <%= link_to l(:button_cancel), "#", onclick: '$("#add-quantity").hide(); return false;' %>
   <% end %>
   <hr>
 </div>