diff --git a/app/models/query.rb b/app/models/query.rb
index 231ded24b..9c7ddc902 100644
--- a/app/models/query.rb
+++ b/app/models/query.rb
@@ -202,7 +202,6 @@ class QueryFilter
   def initialize(field, options)
     @field = field.to_s
     @options = options
-    @options[:name] ||= l(options[:label] || "field_#{field}".gsub(/_id$/, ''))
     # Consider filters with a Proc for values as remote by default
     @remote = options.key?(:remote) ? options[:remote] : options[:values].is_a?(Proc)
   end
@@ -674,6 +673,10 @@ class Query < ActiveRecord::Base
   # Adds an available filter
   def add_available_filter(field, options)
     @available_filters ||= ActiveSupport::OrderedHash.new
+
+    field_name = field.gsub(/_id$/, '')
+    options[:name] ||= l(options[:label], default: queried_class.human_attribute_name(field_name))
+    
     @available_filters[field] = QueryFilter.new(field, options)
     @available_filters
   end