diff --git a/app/helpers/rails_admin/main_helper.rb b/app/helpers/rails_admin/main_helper.rb
index 2e1bd91c7a..d80f4e4b09 100644
--- a/app/helpers/rails_admin/main_helper.rb
+++ b/app/helpers/rails_admin/main_helper.rb
@@ -42,7 +42,6 @@ def ordered_filters
     def ordered_filter_options
       if ordered_filters
         @ordered_filter_options ||= ordered_filters.map do |duplet|
-          options = {index: duplet[0]}
           filter_for_field = duplet[1]
           filter_name = filter_for_field.keys.first
           filter_hash = filter_for_field.values.first
@@ -50,20 +49,11 @@ def ordered_filter_options
             raise "#{filter_name} is not currently filterable; filterable fields are #{filterable_fields.map(&:name).join(', ')}"
           end
 
-          case field.type
-          when :enum
-            options[:select_options] = options_for_select(field.with(object: @abstract_model.model.new).enum, filter_hash['v'])
-          when :date, :datetime, :time
-            options[:datetimepicker_options] = field.datepicker_options
-          end
-          options[:label] = field.label
-          options[:name]  = field.name
-          options[:type]  = field.type
-          options[:value] = filter_hash['v']
-          options[:label] = field.label
-          options[:operator] = filter_hash['o'] || field.default_filter_operator
-          options[:required] = field.required
-          options
+          field.filter_options.merge(
+            index: duplet[0],
+            operator: filter_hash['o'] || field.default_filter_operator,
+            value: filter_hash['v'],
+          )
         end
       end
     end
diff --git a/app/views/rails_admin/main/index.html.erb b/app/views/rails_admin/main/index.html.erb
index c5bee0dfe5..dd202cbd5a 100644
--- a/app/views/rails_admin/main/index.html.erb
+++ b/app/views/rails_admin/main/index.html.erb
@@ -26,26 +26,11 @@
       </a>
       <ul class="dropdown-menu dropdown-menu-end" id="filters">
         <% filterable_fields.each do |field| %>
-          <%
-            field_options = case field.type
-                            when :enum
-                              options_for_select(field.with(object: @abstract_model.model.new).enum)
-                            else
-                              ''
-                            end
-          %>
           <li>
             <a
               href="#"
               class="dropdown-item"
-              data-field-label="<%= field.label %>"
-              data-field-name="<%= field.name %>"
-              data-field-operator="<%= field.default_filter_operator %>"
-              data-field-options="<%= "#{field_options}" %>"
-              data-field-required="<%= field.required.to_s %>"
-              data-field-type="<%= field.type %>"
-              data-field-value=""
-              data-field-datetimepicker-options="<%= field.try(:datepicker_options).try(:to_json) %>"
+              data-options="<%= field.with(view: self).filter_options.to_json %>"
             >
               <%= field.label %>
             </a>
diff --git a/config/locales/rails_admin.en.yml b/config/locales/rails_admin.en.yml
index 0e34dfb9d2..4a0730bd57 100644
--- a/config/locales/rails_admin.en.yml
+++ b/config/locales/rails_admin.en.yml
@@ -1,8 +1,8 @@
 en:
   admin:
     js:
-      true: True
-      false: False
+      true: "True"
+      false: "False"
       is_present: Is present
       is_blank: Is blank
       date: Date ...
diff --git a/lib/rails_admin/config/fields/base.rb b/lib/rails_admin/config/fields/base.rb
index d3ac3aa8ae..d57803a416 100644
--- a/lib/rails_admin/config/fields/base.rb
+++ b/lib/rails_admin/config/fields/base.rb
@@ -78,6 +78,10 @@ def sort_column
           !virtual? || children_fields.first || false
         end
 
+        register_instance_option :search_operator do
+          RailsAdmin::Config.default_search_operator
+        end
+
         register_instance_option :queryable? do
           !virtual?
         end
@@ -86,8 +90,22 @@ def sort_column
           !!searchable
         end
 
-        register_instance_option :search_operator do
-          @search_operator ||= RailsAdmin::Config.default_search_operator
+        register_instance_option :filter_operators do
+          []
+        end
+
+        register_instance_option :default_filter_operator do
+          nil
+        end
+
+        def filter_options
+          {
+            label: label,
+            name: name,
+            operator: default_filter_operator,
+            operators: filter_operators,
+            type: type,
+          }
         end
 
         # serials and dates are reversed in list, which is more natural (last modified items first).
@@ -242,10 +260,6 @@ def sort_column
           []
         end
 
-        register_instance_option :default_filter_operator do
-          nil
-        end
-
         register_instance_option :eager_load do
           false
         end
diff --git a/lib/rails_admin/config/fields/types/belongs_to_association.rb b/lib/rails_admin/config/fields/types/belongs_to_association.rb
index 76a8eb7159..88f91474d2 100644
--- a/lib/rails_admin/config/fields/types/belongs_to_association.rb
+++ b/lib/rails_admin/config/fields/types/belongs_to_association.rb
@@ -9,6 +9,10 @@ module Types
         class BelongsToAssociation < RailsAdmin::Config::Fields::Association
           RailsAdmin::Config::Fields::Types.register(self)
 
+          register_instance_option :filter_operators do
+            %w[_discard like not_like is starts_with ends_with] + (required? ? [] : %w[_separator _present _blank])
+          end
+
           register_instance_option :formatted_value do
             (o = value) && o.send(associated_model_config.object_label_method)
           end
diff --git a/lib/rails_admin/config/fields/types/boolean.rb b/lib/rails_admin/config/fields/types/boolean.rb
index 2d3124a218..7c2839702f 100644
--- a/lib/rails_admin/config/fields/types/boolean.rb
+++ b/lib/rails_admin/config/fields/types/boolean.rb
@@ -24,6 +24,10 @@ class Boolean < RailsAdmin::Config::Fields::Base
             }
           end
 
+          register_instance_option :filter_operators do
+            %w[_discard true false] + (required? ? [] : %w[_separator _present _blank])
+          end
+
           register_instance_option :nullable? do
             properties&.nullable?
           end
diff --git a/lib/rails_admin/config/fields/types/datetime.rb b/lib/rails_admin/config/fields/types/datetime.rb
index ab18e8c483..8013b724c9 100644
--- a/lib/rails_admin/config/fields/types/datetime.rb
+++ b/lib/rails_admin/config/fields/types/datetime.rb
@@ -18,6 +18,16 @@ def parse_input(params)
             params[name] = parse_value(params[name]) if params[name]
           end
 
+          register_instance_option :filter_operators do
+            %w[default between today yesterday this_week last_week] + (required? ? [] : %w[_separator _not_null _null])
+          end
+
+          def filter_options
+            super.merge(
+              datetimepicker_options: datepicker_options,
+            )
+          end
+
           register_instance_option :date_format do
             :long
           end
diff --git a/lib/rails_admin/config/fields/types/enum.rb b/lib/rails_admin/config/fields/types/enum.rb
index 976879c1cb..961e6ff489 100644
--- a/lib/rails_admin/config/fields/types/enum.rb
+++ b/lib/rails_admin/config/fields/types/enum.rb
@@ -9,16 +9,27 @@ module Types
         class Enum < RailsAdmin::Config::Fields::Base
           RailsAdmin::Config::Fields::Types.register(self)
 
+          register_instance_option :filter_operators do
+            %w[_discard] +
+              enum.map do |label, value|
+                {label: label, value: value || label}
+              end + (required? ? [] : %w[_separator _present _blank])
+          end
+
           register_instance_option :partial do
             :form_enumeration
           end
 
           register_instance_option :enum_method do
-            @enum_method ||= bindings[:object].class.respond_to?("#{name}_enum") || bindings[:object].respond_to?("#{name}_enum") ? "#{name}_enum" : name
+            @enum_method ||= bindings[:object].class.respond_to?("#{name}_enum") || (bindings[:object] || abstract_model.model.new).respond_to?("#{name}_enum") ? "#{name}_enum" : name
           end
 
           register_instance_option :enum do
-            bindings[:object].class.respond_to?(enum_method) ? bindings[:object].class.send(enum_method) : bindings[:object].send(enum_method)
+            if abstract_model.model.respond_to?(enum_method)
+              abstract_model.model.send(enum_method)
+            else
+              (bindings[:object] || abstract_model.model.new).send(enum_method)
+            end
           end
 
           register_instance_option :pretty_value do
diff --git a/lib/rails_admin/config/fields/types/has_one_association.rb b/lib/rails_admin/config/fields/types/has_one_association.rb
index dc8551ac3d..f6219a7fd3 100644
--- a/lib/rails_admin/config/fields/types/has_one_association.rb
+++ b/lib/rails_admin/config/fields/types/has_one_association.rb
@@ -10,6 +10,10 @@ class HasOneAssociation < RailsAdmin::Config::Fields::Association
           # Register field type for the type loader
           RailsAdmin::Config::Fields::Types.register(self)
 
+          register_instance_option :filter_operators do
+            %w[_discard like not_like is starts_with ends_with] + (required? ? [] : %w[_separator _present _blank])
+          end
+
           register_instance_option :partial do
             nested_form ? :form_nested_one : :form_filtering_select
           end
diff --git a/lib/rails_admin/config/fields/types/numeric.rb b/lib/rails_admin/config/fields/types/numeric.rb
index 9abff008b1..f6c086cf62 100644
--- a/lib/rails_admin/config/fields/types/numeric.rb
+++ b/lib/rails_admin/config/fields/types/numeric.rb
@@ -10,6 +10,10 @@ class Numeric < RailsAdmin::Config::Fields::Base
           # Register field type for the type loader
           RailsAdmin::Config::Fields::Types.register(self)
 
+          register_instance_option :filter_operators do
+            %w[default between] + (required? ? [] : %w[_separator _not_null _null])
+          end
+
           register_instance_option :view_helper do
             :number_field
           end
diff --git a/lib/rails_admin/config/fields/types/string_like.rb b/lib/rails_admin/config/fields/types/string_like.rb
index eb486682b1..5f3e9507e2 100644
--- a/lib/rails_admin/config/fields/types/string_like.rb
+++ b/lib/rails_admin/config/fields/types/string_like.rb
@@ -7,6 +7,10 @@ module Config
     module Fields
       module Types
         class StringLike < RailsAdmin::Config::Fields::Base
+          register_instance_option :filter_operators do
+            %w[_discard like not_like is starts_with ends_with] + (required? ? [] : %w[_separator _present _blank])
+          end
+
           register_instance_option :treat_empty_as_nil? do
             properties.try(:nullable?)
           end
diff --git a/lib/rails_admin/config/fields/types/time.rb b/lib/rails_admin/config/fields/types/time.rb
index 8fe54bf429..4294cc92e3 100644
--- a/lib/rails_admin/config/fields/types/time.rb
+++ b/lib/rails_admin/config/fields/types/time.rb
@@ -13,6 +13,10 @@ def parse_value(value)
             abstract_model.model.type_for_attribute(name.to_s).serialize(super)&.change(year: 2000, month: 1, day: 1)
           end
 
+          register_instance_option :filter_operators do
+            %w[default between] + (required? ? [] : %w[_separator _not_null _null])
+          end
+
           register_instance_option :datepicker_options do
             {
               allowInput: true,
diff --git a/spec/integration/actions/index_spec.rb b/spec/integration/actions/index_spec.rb
index 03d3681cfa..2da0cc05c9 100644
--- a/spec/integration/actions/index_spec.rb
+++ b/spec/integration/actions/index_spec.rb
@@ -324,7 +324,7 @@
           type: 'string',
           value: '',
           operator: 'is',
-          required: true,
+          operators: %w[_discard like not_like is starts_with ends_with],
         },
         {
           index: 2,
@@ -333,7 +333,7 @@
           type: 'belongs_to_association',
           value: '',
           operator: nil,
-          required: false,
+          operators: %w[_discard like not_like is starts_with ends_with _separator _present _blank],
         },
       ]
     end
diff --git a/spec/integration/widgets/filter_box_spec.rb b/spec/integration/widgets/filter_box_spec.rb
index 150f0934cf..ec6878ff4c 100644
--- a/spec/integration/widgets/filter_box_spec.rb
+++ b/spec/integration/widgets/filter_box_spec.rb
@@ -67,6 +67,25 @@
     end
   end
 
+  it 'supports limiting filter operators' do
+    RailsAdmin.config Player do
+      list do
+        field :name do
+          filter_operators %w[is starts_with _present]
+        end
+      end
+    end
+
+    visit index_path(model_name: 'player')
+    is_expected.to have_no_css('#filters_box .filter')
+    click_link 'Add filter'
+    click_link 'Name'
+
+    within(:select, name: /f\[name\]\[\d+\]\[o\]/) do
+      expect(page.all('option').map(&:value)).to eq %w[is starts_with _present]
+    end
+  end
+
   describe 'for boolean field' do
     before do
       RailsAdmin.config FieldTest do
@@ -133,9 +152,10 @@
       visit index_path(model_name: 'team')
       click_link 'Add filter'
       click_link 'Color'
-      expect(all('.select-single option').map(&:text)).to include 'white', 'black', 'red', 'green', 'blu<e>é'
+      expect(all('#filters_box option').map(&:text)).to include 'white', 'black', 'red', 'green', 'blu<e>é'
       find('.filter .switch-select .fa-plus').click
-      expect(all('.select-multiple option').map(&:text)).to include 'white', 'black', 'red', 'green', 'blu<e>é'
+      expect(find('#filters_box select')['multiple']).to be true
+      expect(find('#filters_box select')['name']).to match(/\[\]$/)
     end
   end
 
diff --git a/src/rails_admin/filter-box.js b/src/rails_admin/filter-box.js
index 8077a427fa..d82ea69d99 100644
--- a/src/rails_admin/filter-box.js
+++ b/src/rails_admin/filter-box.js
@@ -7,98 +7,54 @@ import flatpickr from "flatpickr";
 
   $.filters = filters = {
     append: function (options) {
-      options = options || {};
       var field_label = options["label"];
       var field_name = options["name"];
       var field_type = options["type"];
-      var field_value = options["value"];
+      var field_value = options["value"] || "";
       var field_operator = options["operator"];
-      var select_options = options["select_options"];
-      var required = options["required"];
+      var operators = options["operators"];
       var index = options["index"];
       var value_name = "f[" + field_name + "][" + index + "][v]";
       var operator_name = "f[" + field_name + "][" + index + "][o]";
       var control = null;
       var additional_control = null;
 
+      if (operators.length > 0) {
+        control = $(
+          '<select class="form-control form-control-sm"></select>'
+        ).prop("name", operator_name);
+
+        operators.forEach((operator) => {
+          var element = this.build_operator(operator, options);
+          if (!element) {
+            return;
+          }
+          if (element.prop("value") === field_operator) {
+            element.prop("selected", true);
+          }
+          control.append(element);
+        });
+
+        if (control.find("[data-additional-fieldset]").length > 0) {
+          control.addClass("switch-additional-fieldsets");
+        }
+      }
+
       switch (field_type) {
         case "boolean":
-          control = $('<select class="form-control form-control-sm"></select>')
-            .prop("name", value_name)
-            .append('<option value="_discard">...</option>')
-            .append(
-              $('<option value="true"></option>')
-                .prop("selected", field_value == "true")
-                .text(I18n.t("true"))
-            )
-            .append(
-              $('<option value="false"></option>')
-                .prop("selected", field_value == "false")
-                .text(I18n.t("false"))
-            );
-          if (!required) {
-            control.append([
-              '<option disabled="disabled">---------</option>',
-              $('<option value="_present"></option>')
-                .prop("selected", field_value == "_present")
-                .text(I18n.t("is_present")),
-              $('<option value="_blank"></option>')
-                .prop("selected", field_value == "_blank")
-                .text(I18n.t("is_blank")),
-            ]);
-          }
+          control &&
+            control
+              .prop("name", value_name)
+              .find("option")
+              .each(function () {
+                if ($(this).attr("value") === field_value)
+                  $(this).attr("selected", true);
+              });
           break;
         case "date":
         case "datetime":
         case "timestamp":
         case "time":
-          control =
-            control ||
-            $(
-              '<select class="switch-additional-fieldsets form-control form-control-sm"></select>'
-            )
-              .prop("name", operator_name)
-              .append(
-                $(
-                  '<option data-additional-fieldset="default" value="default"></option>'
-                )
-                  .prop("selected", field_operator == "default")
-                  .text(I18n.t(field_type == "time" ? "time" : "date"))
-              )
-              .append(
-                $(
-                  '<option data-additional-fieldset="between" value="between"></option>'
-                )
-                  .prop("selected", field_operator == "between")
-                  .text(I18n.t("between_and_"))
-              );
-          if (field_type != "time") {
-            control.append([
-              $('<option value="today"></option>')
-                .prop("selected", field_operator == "today")
-                .text(I18n.t("today")),
-              $('<option value="yesterday"></option>')
-                .prop("selected", field_operator == "yesterday")
-                .text(I18n.t("yesterday")),
-              $('<option value="this_week"></option>')
-                .prop("selected", field_operator == "this_week")
-                .text(I18n.t("this_week")),
-              $('<option value="last_week"></option>')
-                .prop("selected", field_operator == "last_week")
-                .text(I18n.t("last_week")),
-            ]);
-          }
-          if (!required) {
-            control.append([
-              '<option disabled="disabled">---------</option>',
-              $('<option value="_not_null"></option>')
-                .prop("selected", field_operator == "_not_null")
-                .text(I18n.t("is_present")),
-              $('<option value="_null"></option>')
-                .prop("selected", field_operator == "_null")
-                .text(I18n.t("is_blank")),
-            ]);
-          }
           additional_control = $.map(
             [undefined, "-∞", "∞"],
             function (placeholder, index) {
@@ -126,102 +82,34 @@ import flatpickr from "flatpickr";
           );
           break;
         case "enum":
-          var multiple_values = field_value instanceof Array ? true : false;
-          control = $(
-            '<select class="select-single form-control form-control-sm"></select>'
-          )
-            .css("display", multiple_values ? "none" : "inline-block")
-            .prop("name", multiple_values ? undefined : value_name)
-            .data("name", value_name)
-            .append('<option value="_discard">...</option>')
-            .append(
-              required
-                ? []
-                : [
-                    $('<option value="_present"></option>')
-                      .prop("selected", field_value == "_present")
-                      .text(I18n.t("is_present")),
-                    $('<option value="_blank"></option>')
-                      .prop("selected", field_value == "_blank")
-                      .text(I18n.t("is_blank")),
-                    '<option disabled="disabled">---------</option>',
-                  ]
-            )
-            .append(select_options)
-            .add(
-              $(
-                '<select multiple="multiple" class="select-multiple form-control form-control-sm"></select>'
-              )
-                .css("display", multiple_values ? "inline-block" : "none")
-                .prop("name", multiple_values ? value_name + "[]" : undefined)
-                .data("name", value_name + "[]")
-                .append(select_options)
-            )
-            .add(
-              $('<a href="#" class="switch-select"></a>').append(
-                $("<i></i>").addClass(
-                  "fas fa-" + (multiple_values ? "minus" : "plus")
+          if (control) {
+            var multiple = field_value instanceof Array;
+            control = control
+              .prop("name", multiple ? value_name + "[]" : value_name)
+              .prop("multiple", multiple)
+              .add(
+                $('<a href="#" class="switch-select"></a>').append(
+                  $("<i></i>").addClass(
+                    "fas fa-" + (multiple ? "minus" : "plus")
+                  )
                 )
+              );
+            control.find("option").each(function () {
+              const value = $(this).attr("value");
+              if (
+                multiple ? field_value.includes(value) : value === field_value
               )
-            );
+                $(this).attr("selected", true);
+            });
+            if (multiple)
+              control.find("option[value^=_],option[disabled]").hide();
+          }
           break;
         case "citext":
         case "string":
         case "text":
         case "belongs_to_association":
         case "has_one_association":
-          control = $(
-            '<select class="switch-additional-fieldsets form-control form-control-sm"></select>'
-          )
-            .prop("value", field_operator)
-            .prop("name", operator_name)
-            .append('<option value="_discard">...</option>')
-            .append(
-              $(
-                '<option data-additional-fieldset="additional-fieldset" value="like"></option>'
-              )
-                .prop("selected", field_operator == "like")
-                .text(I18n.t("contains"))
-            )
-            .append(
-              $(
-                '<option data-additional-fieldset="additional-fieldset" value="not_like"></option>'
-              )
-                .prop("selected", field_operator == "not_like")
-                .text(I18n.t("does_not_contain"))
-            )
-            .append(
-              $(
-                '<option data-additional-fieldset="additional-fieldset" value="is"></option>'
-              )
-                .prop("selected", field_operator == "is")
-                .text(I18n.t("is_exactly"))
-            )
-            .append(
-              $(
-                '<option data-additional-fieldset="additional-fieldset" value="starts_with"></option>'
-              )
-                .prop("selected", field_operator == "starts_with")
-                .text(I18n.t("starts_with"))
-            )
-            .append(
-              $(
-                '<option data-additional-fieldset="additional-fieldset" value="ends_with"></option>'
-              )
-                .prop("selected", field_operator == "ends_with")
-                .text(I18n.t("ends_with"))
-            );
-          if (!required) {
-            control.append([
-              '<option disabled="disabled">---------</option>',
-              $('<option value="_present"></option>')
-                .prop("selected", field_operator == "_present")
-                .text(I18n.t("is_present")),
-              $('<option value="_blank"></option>')
-                .prop("selected", field_operator == "_blank")
-                .text(I18n.t("is_blank")),
-            ]);
-          }
           additional_control = $(
             '<input class="additional-fieldset form-control form-control-sm" type="text" />'
           )
@@ -237,35 +125,6 @@ import flatpickr from "flatpickr";
         case "integer":
         case "decimal":
         case "float":
-          control = $(
-            '<select class="switch-additional-fieldsets form-control form-control-sm"></select>'
-          )
-            .prop("name", operator_name)
-            .append(
-              $(
-                '<option data-additional-fieldset="default" value="default"></option>'
-              )
-                .prop("selected", field_operator == "default")
-                .text(I18n.t("number"))
-            )
-            .append(
-              $(
-                '<option data-additional-fieldset="between" value="between"></option>'
-              )
-                .prop("selected", field_operator == "between")
-                .text(I18n.t("between_and_"))
-            );
-          if (!required) {
-            control.append([
-              '<option disabled="disabled">---------</option>',
-              $('<option value="_not_null"></option>')
-                .prop("selected", field_operator == "_not_null")
-                .text(I18n.t("is_present")),
-              $('<option value="_null"></option>')
-                .prop("selected", field_operator == "_null")
-                .text(I18n.t("is_blank")),
-            ]);
-          }
           additional_control = $(
             '<input class="additional-fieldset default form-control form-control-sm" type="text" />'
           )
@@ -348,21 +207,114 @@ import flatpickr from "flatpickr";
 
       $("hr.filters_box:hidden").show("slow");
     },
+    build_operator: function (operator, options) {
+      if (operator instanceof Object) {
+        var element = $("<option></option>");
+        element.text(operator.label);
+        delete operator.label;
+        for (const key in operator) {
+          element.attr(key, operator[key]);
+        }
+        return element;
+      }
+      switch (operator) {
+        case "_discard":
+          return $('<option value="_discard">...</option>');
+        case "_separator":
+          return $('<option disabled="disabled">---------</option>');
+        case "_present":
+          return $('<option value="_present"></option>').text(
+            I18n.t("is_present")
+          );
+        case "_blank":
+          return $('<option value="_blank"></option>').text(I18n.t("is_blank"));
+        case "_not_null":
+          return $('<option value="_not_null"></option>').text(
+            I18n.t("is_present")
+          );
+        case "_null":
+          return $('<option value="_null"></option>').text(I18n.t("is_blank"));
+
+        case "true":
+          return $('<option value="true"></option>').text(I18n.t("true"));
+        case "false":
+          return $('<option value="false"></option>').text(I18n.t("false"));
+
+        case "today":
+          return $('<option value="today"></option>').text(I18n.t("today"));
+        case "yesterday":
+          return $('<option value="yesterday"></option>').text(
+            I18n.t("yesterday")
+          );
+        case "this_week":
+          return $('<option value="this_week"></option>').text(
+            I18n.t("this_week")
+          );
+        case "last_week":
+          return $('<option value="last_week"></option>').text(
+            I18n.t("last_week")
+          );
+
+        case "like":
+          return $(
+            '<option data-additional-fieldset="additional-fieldset" value="like"></option>'
+          ).text(I18n.t("contains"));
+        case "not_like":
+          return $(
+            '<option data-additional-fieldset="additional-fieldset" value="not_like"></option>'
+          ).text(I18n.t("does_not_contain"));
+        case "is":
+          return $(
+            '<option data-additional-fieldset="additional-fieldset" value="is"></option>'
+          ).text(I18n.t("is_exactly"));
+        case "starts_with":
+          return $(
+            '<option data-additional-fieldset="additional-fieldset" value="starts_with"></option>'
+          ).text(I18n.t("starts_with"));
+        case "ends_with":
+          return $(
+            '<option data-additional-fieldset="additional-fieldset" value="ends_with"></option>'
+          ).text(I18n.t("ends_with"));
+
+        case "default":
+          var label;
+          switch (options.type) {
+            case "date":
+            case "datetime":
+            case "timestamp":
+              label = I18n.t("date");
+              break;
+            case "time":
+              label = I18n.t("time");
+              break;
+            case "integer":
+            case "decimal":
+            case "float":
+              label = I18n.t("number");
+              break;
+          }
+          return $(
+            '<option data-additional-fieldset="default" value="default"></option>'
+          ).text(label);
+        case "between":
+          return $(
+            '<option data-additional-fieldset="between" value="between"></option>'
+          ).text(I18n.t("between_and_"));
+
+        default:
+          return null;
+      }
+    },
   };
 
   $(document).on("click", "#filters a", function (e) {
     e.preventDefault();
-    $.filters.append({
-      label: $(this).data("field-label"),
-      name: $(this).data("field-name"),
-      type: $(this).data("field-type"),
-      value: $(this).data("field-value"),
-      operator: $(this).data("field-operator"),
-      select_options: $(this).data("field-options"),
-      required: $(this).data("field-required"),
-      index: $.now().toString().slice(6, 11),
-      datetimepicker_options: $(this).data("field-datetimepicker-options"),
-    });
+    $.filters.append(
+      $.extend(
+        { index: $.now().toString().slice(6, 11) },
+        $(this).data("options")
+      )
+    );
   });
 
   $(document).on("click", "#filters_box .delete", function (e) {
@@ -375,12 +327,15 @@ import flatpickr from "flatpickr";
 
   $(document).on("click", "#filters_box .switch-select", function (e) {
     e.preventDefault();
-    var selected_select = $(this).siblings("select:visible");
-    var not_selected_select = $(this).siblings("select:hidden");
-    not_selected_select
-      .attr("name", not_selected_select.data("name"))
-      .show("slow");
-    selected_select.attr("name", null).hide("slow");
+    var select = $(this).siblings("select");
+    select.attr("multiple", !select.attr("multiple"));
+    select.attr(
+      "name",
+      select.attr("multiple")
+        ? select.attr("name") + "[]"
+        : select.attr("name").replace(/\[\]$/, "")
+    );
+    select.find("option[value^=_],option[disabled]").toggle();
     $(this).find("i").toggleClass("fa-plus fa-minus");
   });