diff --git a/hawc/apps/animal/filterset.py b/hawc/apps/animal/filterset.py
index 23a3499ac6..3167228dc7 100644
--- a/hawc/apps/animal/filterset.py
+++ b/hawc/apps/animal/filterset.py
@@ -8,6 +8,7 @@
     AutocompleteModelChoiceFilter,
     AutocompleteModelMultipleChoiceFilter,
     BaseFilterSet,
+    FilterForm,
     PaginationFilter,
 )
 from ..study.autocomplete import StudyAutocomplete
@@ -166,6 +167,7 @@ class EndpointFilterSet(BaseFilterSet):
 
     class Meta:
         model = models.Endpoint
+        form = FilterForm
         fields = [
             "studies",
             "chemical",
diff --git a/hawc/apps/common/filterset.py b/hawc/apps/common/filterset.py
index 86f850951f..3422976889 100644
--- a/hawc/apps/common/filterset.py
+++ b/hawc/apps/common/filterset.py
@@ -3,12 +3,16 @@
 import django_filters as df
 from crispy_forms import layout as cfl
 from django import forms
-from django_filters.utils import get_model_field
 from pydantic import BaseModel, conlist
 
 from ..assessment.models import Assessment
 from . import autocomplete
-from .forms import BaseFormHelper, form_actions_apply_filters
+from .forms import (
+    BaseFormHelper,
+    ExpandableFilterFormHelper,
+    InlineFilterFormHelper,
+    form_actions_apply_filters,
+)
 
 
 def filter_noop(queryset, name, value):
@@ -88,111 +92,71 @@ def apply_layout(self, helper):
             row.apply_layout(helper, i)
 
 
-class FilterForm(forms.Form):
-    def __init__(self, *args, **kwargs):
-        grid_layout = kwargs.pop("grid_layout", None)
-        self.grid_layout = GridLayout.parse_obj(grid_layout) if grid_layout is not None else None
+class InlineFilterForm(forms.Form):
+    """Form model used for inline filterset forms."""
+
+    helper_class = InlineFilterFormHelper
 
+    def __init__(self, *args, **kwargs):
+        """Grabs grid_layout kwarg and passes it to GridLayout to apply the layout."""
+        layout = kwargs.pop("grid_layout", None)
+        self.grid_layout = GridLayout.parse_obj(layout) if layout else None
+        self.main_field = kwargs.pop("main_field", None)
+        self.appended_fields = kwargs.pop("appended_fields", [])
+        self.dynamic_fields = kwargs.pop("dynamic_fields", [])
         super().__init__(*args, **kwargs)
 
     @property
     def helper(self):
-        helper = BaseFormHelper(self, form_actions=form_actions_apply_filters())
+        """Helper method for setting up the form."""
+        helper = self.helper_class(
+            self,
+            main_field=self.main_field,
+            appended_fields=self.appended_fields,
+        )
         helper.form_method = "GET"
-
-        if self.grid_layout:
-            self.grid_layout.apply_layout(helper)
-
         return helper
 
 
-class FilterSetOptions:
-    def __init__(self, options=None):
-        self.model = getattr(options, "model", None)
-        self.fields = getattr(options, "fields", None)
-        self.exclude = getattr(options, "exclude", None)
-
-        self.filter_overrides = getattr(options, "filter_overrides", {})
-        self.field_kwargs = getattr(options, "field_kwargs", {})
-        self.grid_layout = getattr(options, "grid_layout", None)
+class ExpandableFilterForm(InlineFilterForm):
+    """Form model used for expandable inline filterset forms."""
 
-        self.form = getattr(options, "form", FilterForm)
+    helper_class = ExpandableFilterFormHelper
 
+    is_expanded = forms.CharField(initial="false", widget=forms.HiddenInput())
 
-class FilterSetMetaclass(df.filterset.FilterSetMetaclass):
-    def __new__(cls, name, bases, attrs):
-        attrs["declared_filters"] = cls.get_declared_filters(bases, attrs)
+    def clean(self):
+        """Remove 'is_expanded' from form data before data is used for filtering."""
+        cleaned_data = super().clean()
+        cleaned_data.pop("is_expanded", None)
 
-        new_class = type.__new__(cls, name, bases, attrs)
-        new_class._meta = FilterSetOptions(getattr(new_class, "Meta", None))
-        new_class.base_filters = new_class.get_filters()
 
-        for filter_name, field_kwargs in new_class._meta.field_kwargs.items():
-            new_class.base_filters[filter_name].extra.update(field_kwargs)
+class FilterForm(forms.Form):
+    # TODO: remove once all filtersets are converted to Inline or Expandable forms
+    def __init__(self, *args, **kwargs):
+        grid_layout = kwargs.pop("grid_layout", None)
+        self.grid_layout = GridLayout.parse_obj(grid_layout) if grid_layout is not None else None
+        self.dynamic_fields = kwargs.pop("dynamic_fields", None)
+        super().__init__(*args, **kwargs)
 
-        return new_class
+    @property
+    def helper(self):
+        helper = BaseFormHelper(self, form_actions=form_actions_apply_filters())
+        helper.form_method = "GET"
 
+        if self.grid_layout:
+            self.grid_layout.apply_layout(helper)
 
-class FilterSet(df.filterset.BaseFilterSet, metaclass=FilterSetMetaclass):
-    pass
+        return helper
 
 
-class BaseFilterSet(FilterSet):
-    def __init__(self, *args, assessment: Assessment | None = None, **kwargs):
+class BaseFilterSet(df.FilterSet):
+    def __init__(self, *args, assessment: Assessment | None = None, form_kwargs=None, **kwargs):
         self.assessment = assessment
         super().__init__(*args, **kwargs)
-
-    @classmethod
-    def get_filters(cls):
-        """
-        Get all filters for the filterset. This is the combination of declared and
-        generated filters.
-
-        Overridden from django-filter's BaseFilterSet; we do not include declared filters by default
-        near the end of the method.
-        """
-
-        # No model specified - skip filter generation
-        if not cls._meta.model:
-            return cls.declared_filters.copy()
-
-        # Determine the filters that should be included on the filterset.
-        filters = {}
-        fields = cls.get_fields()
-        undefined = []
-
-        for field_name, lookups in fields.items():
-            field = get_model_field(cls._meta.model, field_name)
-
-            # warn if the field doesn't exist.
-            if field is None:
-                undefined.append(field_name)
-
-            for lookup_expr in lookups:
-                filter_name = cls.get_filter_name(field_name, lookup_expr)
-
-                # If the filter is explicitly declared on the class, skip generation
-                if filter_name in cls.declared_filters:
-                    filters[filter_name] = cls.declared_filters[filter_name]
-                    continue
-
-                if field is not None:
-                    filters[filter_name] = cls.filter_for_field(field, field_name, lookup_expr)
-
-        # Allow Meta.fields to contain declared filters *only* when a list/tuple
-        if isinstance(cls._meta.fields, list | tuple):
-            undefined = [f for f in undefined if f not in cls.declared_filters]
-
-        if undefined:
-            raise TypeError(
-                "'Meta.fields' must not contain non-model field names: %s" % ", ".join(undefined)
-            )
-
-        # Add in declared filters. This is necessary since we don't enforce adding
-        # declared filters to the 'Meta.fields' option
-        ### We actually do want to enforce Meta.fields; this allows dynamically specifying fields
-        # filters.update(cls.declared_filters)
-        return filters
+        self.form_kwargs = form_kwargs or {}
+        if "grid_layout" not in self.form_kwargs and hasattr(self.Meta, "grid_layout"):
+            self.form_kwargs.update(grid_layout=self.Meta.grid_layout)
 
     @property
     def perms(self):
@@ -204,21 +168,14 @@ def form(self):
             self._form = self.create_form()
         return self._form
 
-    def create_form(self) -> forms.Form:
-        """Create the form used for the filterset.
-
-        Returns:
-            forms.Form: a django.Form instance
-        """
-        Form = self.get_form_class()
+    def create_form(self):
+        form_class = self.get_form_class()
         if self.is_bound:
-            form = Form(self.data, prefix=self.form_prefix, grid_layout=self._meta.grid_layout)
+            form = form_class(self.data, prefix=self.form_prefix, **self.form_kwargs)
         else:
-            form = Form(prefix=self.form_prefix, grid_layout=self._meta.grid_layout)
+            form = form_class(prefix=self.form_prefix, **self.form_kwargs)
+        if form.dynamic_fields:  # removes unwanted fields from a filterset if specified
+            for field in list(form.fields.keys()):
+                if field not in form.dynamic_fields and field != "is_expanded":
+                    form.fields.pop(field)
         return form
-
-
-def dynamic_filterset(_class: type[BaseFilterSet], **meta_kwargs):
-    default_kwargs = _class._meta.__dict__
-    Meta = type("Meta", (object,), {**default_kwargs, **meta_kwargs})
-    return type("DynamicFilterset", (_class,), {"Meta": Meta})
diff --git a/hawc/apps/common/forms.py b/hawc/apps/common/forms.py
index 49f212b256..12a4f6d456 100644
--- a/hawc/apps/common/forms.py
+++ b/hawc/apps/common/forms.py
@@ -57,6 +57,18 @@ def form_actions_apply_filters():
     ]
 
 
+def form_actions_big_apply_filters():
+    """Create big, centered Submit and Cancel buttons for filter forms."""
+    return cfl.HTML(
+        """
+        <div class="d-flex justify-content-center">
+            <input type="submit" name="save" value="Apply Filters" class="btn btn-primary mx-2 py-2" id="submit-id-save" style="width: 15%;">
+            <a role="button" class="btn btn-light mx-2 py-2" href="." style="width: 10%;">Cancel</a>
+        </div>
+        """
+    )
+
+
 class BaseFormHelper(cf.FormHelper):
     error_text_inline = False
     use_custom_control = True
@@ -146,6 +158,151 @@ def add_refresh_page_note(self):
         self.layout.insert(len(self.layout) - 1, note)
 
 
+class InlineFilterFormHelper(BaseFormHelper):
+    """Helper class for creating an inline filtering form with a primary field."""
+
+    def __init__(
+        self,
+        form,
+        main_field: str,
+        appended_fields: list[str],
+        legend_text: str | None = None,
+        help_text: str | None = None,
+        **kwargs,
+    ):
+        """Inline form field helper, with primary search and appended fields.
+
+        This form will have a single search bar with a primary search, inline
+        appended fields, and inline cancel/search buttons.
+
+        Args:
+            form: form
+            main_field: A text input field
+            appended_fields: 1 or more checkbox or select fields (to right of main)
+            legend_text: Legend text to show on the form
+            help_text: help text to show on the form
+            **kwargs: Extra arguments
+        """
+        self.attrs = {}
+        self.kwargs = kwargs
+        self.inputs = []
+        self.form = form
+        self.main_field = main_field
+        self.appended_fields = appended_fields
+        self.legend_text = legend_text
+        self.help_text = help_text
+        self.build_inline_layout()
+
+    def build_inline_layout(self):
+        """Build the custom inline layout, including the grid layout."""
+        if self.main_field:
+            self.layout = cfl.Layout(*list(self.form.fields.keys()))
+            self.add_filter_field(self.main_field, self.appended_fields)
+            if self.form.grid_layout:
+                self.form.grid_layout.apply_layout(self)
+        else:
+            self.build_default_layout(self.form)
+        return self.layout
+
+    def add_filter_field(
+        self,
+        main_field: str,
+        appended_fields: list[str],
+        expandable: bool = False,
+    ):
+        """Add the primary filter field (noncollapsed field(s)) to start of layout."""
+        layout, index = self.get_layout_item(main_field)
+        field = layout.pop(index)
+        for app_field in appended_fields:
+            layout, index = self.get_layout_item(app_field)
+            layout.pop(index)
+        layout.insert(
+            0,
+            FilterFormField(
+                fields=field,
+                appended_fields=appended_fields,
+                expandable=expandable,
+            ),
+        )
+
+
+class ExpandableFilterFormHelper(InlineFilterFormHelper):
+    """Helper class for an inline filtering form with collapsible advanced fields."""
+
+    collapse_field_name: str = "is_expanded"
+
+    def __init__(self, *args, **kwargs):
+        """Collapsable form field helper, primary search and advanced.
+
+        This form will have a single search bar with a primary search, and the
+        ability to expand the bar for additional "advanced" search fields.
+
+        Args:
+            args: Arguments passed to InlineFilterFormHelper
+            kwargs: Keyword arguments passed to InlineFilterFormHelper
+        """
+        super().__init__(*args, **kwargs)
+        self.build_collapsed_layout()
+
+    def build_collapsed_layout(self):
+        """Build the custom collapsed layout including the grid layout."""
+        if self.collapse_field_name not in self.form.fields:
+            raise ValueError(f"Field `{self.collapse_field_name}` is required for this form")
+        self.layout = cfl.Layout(*list(self.form.fields.keys()))
+        layout, collapsed_idx = self.get_layout_item(self.collapse_field_name)
+        collapsed_field = layout.pop(collapsed_idx)
+        self.add_filter_field(self.main_field, self.appended_fields, expandable=True)
+        self.layout.append(form_actions_big_apply_filters())
+        form_index = 1
+        if self.legend_text:
+            self.layout.insert(0, cfl.HTML(f"<legend>{self.legend_text}</legend>"))
+            form_index += 1
+        if self.help_text:
+            self.layout.insert(
+                1,
+                cfl.HTML(f'<p class="form-text text-muted">{self.help_text}</p>'),
+            )
+            form_index += 1
+        if self.form.grid_layout:
+            self.form.grid_layout.apply_layout(self)
+        self[form_index:].wrap_together(cfl.Div, css_class="p-4")
+        is_expanded = self.form.data.get(self.collapse_field_name, "false") == "true"
+        self[form_index:].wrap_together(
+            cfl.Div,
+            id="ff-expand-form",
+            css_class="collapse show" if is_expanded else "collapse",
+        )
+        self.layout.append(collapsed_field)
+        return self.layout
+
+
+class FilterFormField(cfl.Field):
+    """Custom crispy form field that includes appended_fields in the context."""
+
+    template = "common/crispy_layout_filter_field.html"
+
+    def __init__(
+        self,
+        fields,
+        appended_fields: list[str],
+        expandable: bool = False,
+        **kwargs,
+    ):
+        """Set the given field values on the field model."""
+        self.fields = fields
+        self.appended_fields = appended_fields
+        self.expandable = expandable
+        super().__init__(fields, **kwargs)
+
+    def render(self, form, form_style, context, template_pack, extra_context=None, **kwargs):
+        """Render the main_field and appended_fields in the template and return it."""
+        if extra_context is None:
+            extra_context = {}
+        extra_context["appended_fields"] = [form[field] for field in self.appended_fields]
+        extra_context["expandable"] = self.expandable
+        return super().render(form, form_style, context, template_pack, extra_context, **kwargs)
+
+
 class CopyAsNewSelectorForm(forms.Form):
     label = None
     parent_field = None
diff --git a/hawc/apps/common/templates/common/crispy_layout_filter_field.html b/hawc/apps/common/templates/common/crispy_layout_filter_field.html
new file mode 100644
index 0000000000..8532a637b1
--- /dev/null
+++ b/hawc/apps/common/templates/common/crispy_layout_filter_field.html
@@ -0,0 +1,47 @@
+{% load crispy_forms_field %}
+{% load crispy_forms_filters %}
+{% comment %} Adapted from https://github.com/django-crispy-forms/crispy-bootstrap4/blob/main/crispy_bootstrap4/templates/bootstrap4/field.html {% endcomment %}
+<div id="div_{{ field.auto_id }}" class="form-group mb-0">
+    <div class="input-group">
+        {% if expandable %}
+        <div class="input-group-prepend">
+            <a id="ff-expand-form-toggle" class="btn btn-secondary d-flex align-items-center" data-toggle="collapse" data-target="#ff-expand-form" title="Toggle advanced options"><i class="fa fa-caret-down" aria-hidden="true"></i></a>
+        </div>
+        {% endif %}
+        <input type="text" name="{% if field.name|wordcount > 1 %}{{ field.name|slugify }}{% else %}{{ field.name }}{% endif %}"  class="form-control {% if field.errors %} is-invalid {% endif %}" placeholder="{{field.help_text}}" aria-label="{{field.label}}" value="{% if field.value %}{{ field.value }}{% endif %}" {{ field.flat_attrs }}>
+        <div class="input-group-append">
+            {% for field in appended_fields %}
+                {% if field|is_checkbox %}
+                    <div class="form-group input-group-text">
+                        <div class="custom-control custom-checkbox">
+                        {% crispy_field field 'class' 'custom-control-input' %}
+                        <label for="{{ field.id_for_label }}" class="custom-control-label form-sm-field">{{ field.label }}</label>
+                        </div>
+                        {% if field.field.hover_help %}
+                            {% include 'common/helptext_popup.html' with text=field.field.help_text %}
+                        {% endif %}
+                    </div>
+                {% elif field|is_select and use_custom_control %}
+                    {{field.widget}}
+                    {% if field.errors %}
+                        {% crispy_field field 'class' 'custom-select form-sm-field is-invalid' %}
+                    {% else %}
+                        {% crispy_field field 'class' 'custom-select form-sm-field' %}
+                    {% endif %}
+                {% endif %}
+            {% endfor %}
+            <a role="button" class="btn btn-light d-flex flex-wrap align-content-center px-3" href="." title="Reset form"><span aria-hidden="true">&times;</span></a>
+            <button type="submit" name="save" class="btn btn-primary px-5" title="Apply filters"><i class="fa fa-search" aria-hidden="true"></i></button>
+        </div>
+    </div>
+</div>
+{% if expandable %}
+<script>
+document.addEventListener('DOMContentLoaded', function () {
+    $("#ff-expand-form-toggle").click(function() {
+        const value = $("#ff-expand-form").hasClass("show");
+        document.getElementById("id_is_expanded").value=(!value).toString();
+    });
+});
+</script>
+{% endif %}
\ No newline at end of file
diff --git a/hawc/apps/common/templates/common/inline_filter_form.html b/hawc/apps/common/templates/common/inline_filter_form.html
new file mode 100644
index 0000000000..ec59508570
--- /dev/null
+++ b/hawc/apps/common/templates/common/inline_filter_form.html
@@ -0,0 +1,4 @@
+{% load crispy_forms_tags %}
+<div class="mb-4 pt-1">
+    {% crispy form %}
+</div>
\ No newline at end of file
diff --git a/hawc/apps/common/views.py b/hawc/apps/common/views.py
index 88989fe680..4feafba11a 100644
--- a/hawc/apps/common/views.py
+++ b/hawc/apps/common/views.py
@@ -706,15 +706,16 @@ def get_filterset_kwargs(self):
             data=self.request.GET,
             queryset=super().get_queryset(),
             request=self.request,
+            form_kwargs=self.get_filterset_form_kwargs(),
         )
 
-    def get_filterset_class(self) -> type[BaseFilterSet]:
-        return self.filterset_class
+    def get_filterset_form_kwargs(self):
+        return {}
 
     @property
     def filterset(self):
         if not hasattr(self, "_filterset"):
-            self._filterset = self.get_filterset_class()(**self.get_filterset_kwargs())
+            self._filterset = self.filterset_class(**self.get_filterset_kwargs())
         return self._filterset
 
     def get_queryset(self):
diff --git a/hawc/apps/eco/filterset.py b/hawc/apps/eco/filterset.py
index f44dc91a36..22ff8b0b64 100644
--- a/hawc/apps/eco/filterset.py
+++ b/hawc/apps/eco/filterset.py
@@ -1,10 +1,11 @@
-from ..common.filterset import BaseFilterSet
+from ..common.filterset import BaseFilterSet, FilterForm
 from . import models
 
 
 class NestedTermFilterSet(BaseFilterSet):
     class Meta:
         model = models.NestedTerm
+        form = FilterForm
         fields = {
             "name": ["contains"],
         }
diff --git a/hawc/apps/epi/filterset.py b/hawc/apps/epi/filterset.py
index 670d413afd..700c7de55e 100644
--- a/hawc/apps/epi/filterset.py
+++ b/hawc/apps/epi/filterset.py
@@ -6,6 +6,7 @@
 from ..common.filterset import (
     AutocompleteModelMultipleChoiceFilter,
     BaseFilterSet,
+    FilterForm,
     PaginationFilter,
 )
 from ..study.autocomplete import StudyAutocomplete
@@ -136,6 +137,7 @@ class OutcomeFilterSet(BaseFilterSet):
 
     class Meta:
         model = models.Outcome
+        form = FilterForm
         fields = [
             "studies",
             "name",
diff --git a/hawc/apps/epimeta/filterset.py b/hawc/apps/epimeta/filterset.py
index 50b7a796ad..be63376064 100644
--- a/hawc/apps/epimeta/filterset.py
+++ b/hawc/apps/epimeta/filterset.py
@@ -4,6 +4,7 @@
 from ..common.filterset import (
     AutocompleteModelMultipleChoiceFilter,
     BaseFilterSet,
+    FilterForm,
     PaginationFilter,
 )
 from ..study.autocomplete import StudyAutocomplete
@@ -70,6 +71,7 @@ class MetaResultFilterSet(BaseFilterSet):
 
     class Meta:
         model = models.MetaResult
+        form = FilterForm
         fields = [
             "studies",
             "label",
diff --git a/hawc/apps/invitro/filterset.py b/hawc/apps/invitro/filterset.py
index 3d77864080..d4033e8f8a 100644
--- a/hawc/apps/invitro/filterset.py
+++ b/hawc/apps/invitro/filterset.py
@@ -5,6 +5,7 @@
 from ..common.filterset import (
     AutocompleteModelMultipleChoiceFilter,
     BaseFilterSet,
+    FilterForm,
     PaginationFilter,
 )
 from ..study.autocomplete import StudyAutocomplete
@@ -113,6 +114,7 @@ class EndpointFilterSet(BaseFilterSet):
 
     class Meta:
         model = models.IVEndpoint
+        form = FilterForm
         fields = [
             "studies",
             "name",
diff --git a/hawc/apps/lit/filterset.py b/hawc/apps/lit/filterset.py
index 23e2bb5d0f..cf265e67d3 100644
--- a/hawc/apps/lit/filterset.py
+++ b/hawc/apps/lit/filterset.py
@@ -3,7 +3,7 @@
 from django.forms.widgets import CheckboxInput
 from django_filters import FilterSet
 
-from ..common.filterset import BaseFilterSet, PaginationFilter, filter_noop
+from ..common.filterset import BaseFilterSet, ExpandableFilterForm, PaginationFilter, filter_noop
 from . import models
 
 
@@ -15,10 +15,12 @@ class ReferenceFilterSet(BaseFilterSet):
         label="External identifier",
         help_text="Pubmed ID, DOI, HERO ID, etc.",
     )
-    year = df.NumberFilter(label="Year", help_text="Year of publication")
     journal = df.CharFilter(lookup_expr="icontains", label="Journal")
-    title_abstract = df.CharFilter(method="filter_title_abstract", label="Title/Abstract")
-    authors = df.CharFilter(method="filter_authors", label="Authors")
+    ref_search = df.CharFilter(
+        method="filter_search",
+        label="Title/Author/Year",
+        help_text="Filter by title, abstract, authors, or year",
+    )
     search = df.ModelChoiceFilter(
         field_name="searches", queryset=models.Search.objects.all(), label="Search/Import"
     )
@@ -65,6 +67,7 @@ class ReferenceFilterSet(BaseFilterSet):
         help_text="All references that you have tagged",
     )
     order_by = df.OrderingFilter(
+        empty_label="Default Order",
         fields=(
             ("authors", "authors"),
             ("year", "year"),
@@ -83,16 +86,17 @@ class ReferenceFilterSet(BaseFilterSet):
         label="Partially Tagged",
         help_text="References with one unresolved user tag",
     )
-    paginate_by = PaginationFilter()
+    paginate_by = PaginationFilter(empty_label="Default Pagination")
 
     class Meta:
         model = models.Reference
+        form = ExpandableFilterForm
         fields = [
             "id",
             "db_id",
             "year",
             "journal",
-            "title_abstract",
+            "ref_search",
             "authors",
             "search",
             "tags",
@@ -115,8 +119,14 @@ def filter_authors(self, queryset, name, value):
         query = Q(authors_short__unaccent__icontains=value) | Q(authors__unaccent__icontains=value)
         return queryset.filter(query)
 
-    def filter_title_abstract(self, queryset, name, value):
-        query = Q(title__icontains=value) | Q(abstract__icontains=value)
+    def filter_search(self, queryset, name, value):
+        query = (
+            Q(title__icontains=value)
+            | Q(abstract__icontains=value)
+            | Q(authors_short__unaccent__icontains=value)
+            | Q(authors__unaccent__icontains=value)
+            | Q(year__icontains=value)
+        )
         return queryset.filter(query)
 
     def filter_tags(self, queryset, name, value):
diff --git a/hawc/apps/lit/templates/lit/conflict_resolution.html b/hawc/apps/lit/templates/lit/conflict_resolution.html
index 0d830b5ab5..e3e8107302 100644
--- a/hawc/apps/lit/templates/lit/conflict_resolution.html
+++ b/hawc/apps/lit/templates/lit/conflict_resolution.html
@@ -2,7 +2,7 @@
 
 {% block content %}
 <h2>Resolve Tag Conflicts</h2>
-{% include 'common/filter_list.html' with plural_object_name='references' %}
+{% include 'common/inline_filter_form.html' %}
 <ul class="list-group list-group-flush my-3">
     {% for ref in object_list %}
     <li class="list-group-item list-group-item-action conflict-reference-li {% if forloop.first %} pb-4 {% else %} py-4 {% endif %}"
diff --git a/hawc/apps/lit/templates/lit/reference_search.html b/hawc/apps/lit/templates/lit/reference_search.html
index 3db29197a9..cbac4b2b0c 100644
--- a/hawc/apps/lit/templates/lit/reference_search.html
+++ b/hawc/apps/lit/templates/lit/reference_search.html
@@ -2,7 +2,7 @@
 
 {% block content %}
 <h2>References ({{page_obj.paginator.count}} found)</h2>
-{% include 'common/filter_list.html' with plural_object_name='references' %}
+{% include 'common/inline_filter_form.html' %}
 <div id="main"></div>
 {% include 'includes/paginator.html' with plural_object_name='references' %}
 {% endblock %}
diff --git a/hawc/apps/lit/templates/lit/reference_tag.html b/hawc/apps/lit/templates/lit/reference_tag.html
index d300984ceb..08f1de36a5 100644
--- a/hawc/apps/lit/templates/lit/reference_tag.html
+++ b/hawc/apps/lit/templates/lit/reference_tag.html
@@ -1,9 +1,7 @@
 {% extends 'assessment-rooted.html' %}
 
 {% block content %}
-  <div class="mb-2">
-    {% include 'common/filter_list.html' with plural_object_name='references' %}
-  </div>
+  {% include 'common/inline_filter_form.html' %}
   <div id="main"></div>
   {% include "includes/paginator.html" with plural_object_name="references" %}
 {% endblock %}
diff --git a/hawc/apps/lit/templates/lit/reference_user_tags.html b/hawc/apps/lit/templates/lit/reference_user_tags.html
index bd7a3acc92..bedf973138 100644
--- a/hawc/apps/lit/templates/lit/reference_user_tags.html
+++ b/hawc/apps/lit/templates/lit/reference_user_tags.html
@@ -2,8 +2,7 @@
 
 {% block content %}
 <h2>Reference User Tags</h2>
-
-{% include 'common/filter_list.html' with plural_object_name='references' %}
+{% include 'common/inline_filter_form.html' %}
 <ul class="list-group list-group-flush my-3">
     {% for ref in object_list %}
     <li class="list-group-item list-group-item-action conflict-reference-li {% if forloop.first %} pb-4 {% else %} py-4 {% endif %}">
diff --git a/hawc/apps/lit/views.py b/hawc/apps/lit/views.py
index cba20c2f70..4359c2357e 100644
--- a/hawc/apps/lit/views.py
+++ b/hawc/apps/lit/views.py
@@ -15,7 +15,6 @@
 from ..assessment.constants import AssessmentViewPermissions
 from ..assessment.models import Assessment
 from ..common.crumbs import Breadcrumb
-from ..common.filterset import dynamic_filterset
 from ..common.helper import WebappConfig, tryParseInt
 from ..common.views import (
     BaseCreate,
@@ -254,6 +253,7 @@ class TagReferences(BaseFilterList):
     template_name = "lit/reference_tag.html"
     parent_model = Assessment
     model = models.Reference
+    filterset_class = filterset.ReferenceFilterSet
     assessment_permission = AssessmentViewPermissions.TEAM_MEMBER
     paginate_by = 100
 
@@ -272,39 +272,33 @@ def get_context_data(self, **kwargs):
         )
         return context
 
-    def get_filterset_class(self):
+    def get_filterset_form_kwargs(self):
         conflict_resolution = self.assessment.literature_settings.conflict_resolution
         if conflict_resolution:
-            return dynamic_filterset(
-                filterset.ReferenceFilterSet,
-                fields=[
-                    "title_abstract",
+            return dict(
+                main_field="ref_search",
+                appended_fields=["partially_tagged", "needs_tagging", "order_by"],
+                dynamic_fields=[
+                    "ref_search",
                     "needs_tagging",
-                    "partially_tagged",
+                    "order_by",
                     "search",
+                    "partially_tagged",
                     "id",
                     "tags",
                     "include_descendants",
                     "anything_tagged",
-                    "order_by",
                     "my_tags",
                     "include_mytag_descendants",
                     "anything_tagged_me",
                 ],
                 grid_layout={
                     "rows": [
+                        {"columns": [{"width": 12}]},
                         {
                             "columns": [
-                                {"width": 5, "extra_css": "pl-4"},
-                                {
-                                    "width": 3,
-                                    "extra_css": "px-3 pt-3 d-flex flex-column",
-                                    "rows": [
-                                        {"columns": [{"width": 12}]},
-                                        {"columns": [{"width": 12}]},
-                                    ],
-                                },
-                                {"width": 4, "extra_css": "pr-4"},
+                                {"width": 6, "extra_css": "px-4"},
+                                {"width": 6, "extra_css": "px-4"},
                             ]
                         },
                         {
@@ -315,7 +309,6 @@ def get_filterset_class(self):
                                         {
                                             "columns": [
                                                 {"width": 12, "extra_css": "px-4 py-2"},
-                                                {"width": 12, "extra_css": "px-4 pt-2"},
                                                 {"width": 7, "extra_css": "pl-4 pb-2"},
                                                 {"width": 5, "extra_css": "pr-4 pb-2"},
                                             ]
@@ -328,7 +321,6 @@ def get_filterset_class(self):
                                         {
                                             "columns": [
                                                 {"width": 12, "extra_css": "px-4 py-2"},
-                                                {"width": 12, "extra_css": "px-4 pt-2"},
                                                 {"width": 7, "extra_css": "px-4 pb-2"},
                                                 {"width": 5, "extra_css": "px-4 pb-2"},
                                             ]
@@ -341,10 +333,9 @@ def get_filterset_class(self):
                 },
             )
         else:
-            return dynamic_filterset(
-                filterset.ReferenceFilterSet,
-                fields=[
-                    "title_abstract",
+            return dict(
+                dynamic_fields=[
+                    "ref_search",
                     "search",
                     "id",
                     "order_by",
@@ -352,14 +343,11 @@ def get_filterset_class(self):
                     "include_descendants",
                     "anything_tagged",
                 ],
+                main_field="ref_search",
+                appended_fields=["order_by"],
                 grid_layout={
                     "rows": [
-                        {
-                            "columns": [
-                                {"width": 6, "extra_css": "px-3"},
-                                {"width": 6, "extra_css": "px-3"},
-                            ]
-                        },
+                        {"columns": [{"width": 12}]},
                         {
                             "columns": [
                                 {
@@ -414,58 +402,66 @@ class ConflictResolution(BaseFilterList):
     template_name = "lit/conflict_resolution.html"
     parent_model = Assessment
     model = models.Reference
+    filterset_class = filterset.ReferenceFilterSet
     assessment_permission = AssessmentViewPermissions.TEAM_MEMBER
-    filterset_class = dynamic_filterset(
-        filterset.ReferenceFilterSet,
-        fields=[
-            "id",
-            "title_abstract",
-            "tags",
-            "include_descendants",
-            "anything_tagged",
-            "my_tags",
-            "include_mytag_descendants",
-            "anything_tagged_me",
-        ],
-        grid_layout={
-            "rows": [
-                {
-                    "columns": [
-                        {"width": 6, "extra_css": "px-4 py-2"},
-                        {"width": 6, "extra_css": "px-4 py-2"},
-                    ]
-                },
-                {
-                    "columns": [
-                        {
-                            "width": 6,
-                            "rows": [
-                                {
-                                    "columns": [
-                                        {"width": 12, "extra_css": "px-4"},
-                                        {"width": 6, "extra_css": "px-4"},
-                                        {"width": 6, "extra_css": "px-4"},
-                                    ]
-                                }
-                            ],
-                        },
-                        {
-                            "width": 6,
-                            "rows": [
-                                {
-                                    "columns": [
-                                        {"width": 12, "extra_css": "px-4"},
-                                        {"width": 6, "extra_css": "px-4"},
-                                        {"width": 6, "extra_css": "px-4"},
-                                    ]
-                                }
-                            ],
-                        },
-                    ]
-                },
-            ]
-        },
-    )
+
+    def get_filterset_form_kwargs(self):
+        return dict(
+            main_field="ref_search",
+            dynamic_fields=[
+                "id",
+                "ref_search",
+                "tags",
+                "include_descendants",
+                "anything_tagged",
+                "my_tags",
+                "include_mytag_descendants",
+                "anything_tagged_me",
+            ],
+            grid_layout={
+                "rows": [
+                    {
+                        "columns": [
+                            {"width": 12},
+                        ]
+                    },
+                    {
+                        "columns": [
+                            {"width": 12, "extra_css": "px-4"},
+                        ]
+                    },
+                    {
+                        "columns": [
+                            {
+                                "width": 6,
+                                "rows": [
+                                    {
+                                        "columns": [
+                                            {"width": 12, "extra_css": "px-4"},
+                                            {"width": 6, "extra_css": "px-4"},
+                                            {"width": 6, "extra_css": "px-4"},
+                                        ]
+                                    }
+                                ],
+                            },
+                            {
+                                "width": 6,
+                                "rows": [
+                                    {
+                                        "columns": [
+                                            {"width": 12, "extra_css": "px-4"},
+                                            {"width": 6, "extra_css": "px-4"},
+                                            {"width": 6, "extra_css": "px-4"},
+                                        ]
+                                    }
+                                ],
+                            },
+                        ]
+                    },
+                ]
+            },
+        )
+
     paginate_by = 50
 
     def get_queryset(self):
@@ -589,65 +585,60 @@ class RefFilterList(BaseFilterList):
     breadcrumb_active_name = "Reference search"
     parent_model = Assessment
     model = models.Reference
-    filterset_class = dynamic_filterset(
-        filterset.ReferenceFilterSet,
-        fields=[
-            "id",
-            "db_id",
-            "search",
-            "year",
-            "title_abstract",
-            "authors",
-            "journal",
-            "order_by",
-            "paginate_by",
-            "tags",
-            "include_descendants",
-            "anything_tagged",
-        ],
-        grid_layout={
-            "rows": [
-                {
-                    "columns": [
-                        {"width": 3, "extra_css": "px-4"},
-                        {"width": 3, "extra_css": "px-4"},
-                        {"width": 3, "extra_css": "px-4"},
-                        {"width": 3, "extra_css": "px-4"},
-                    ]
-                },
-                {
-                    "columns": [
-                        {
-                            "width": 6,
-                            "rows": [
-                                {
-                                    "columns": [
-                                        {"width": 12, "extra_css": "px-4"},
-                                        {"width": 6, "extra_css": "px-4"},
-                                        {"width": 6, "extra_css": "px-4"},
-                                        {"width": 6, "extra_css": "px-4"},
-                                        {"width": 6, "extra_css": "px-4"},
-                                    ]
-                                }
-                            ],
-                        },
-                        {
-                            "width": 6,
-                            "rows": [
-                                {
-                                    "columns": [
-                                        {"width": 12, "extra_css": "px-4"},
-                                        {"width": 6, "extra_css": "px-4"},
-                                        {"width": 6, "extra_css": "px-4"},
-                                    ]
-                                }
-                            ],
-                        },
-                    ]
-                },
-            ]
-        },
-    )
+    filterset_class = filterset.ReferenceFilterSet
+
+    def get_filterset_form_kwargs(self):
+        return dict(
+            main_field="ref_search",
+            appended_fields=["order_by", "paginate_by"],
+            dynamic_fields=[
+                "id",
+                "db_id",
+                "search",
+                "ref_search",
+                "journal",
+                "order_by",
+                "paginate_by",
+                "tags",
+                "include_descendants",
+                "anything_tagged",
+            ],
+            grid_layout={
+                "rows": [
+                    {"columns": [{"width": 12}]},
+                    {
+                        "columns": [
+                            {
+                                "width": 6,
+                                "rows": [
+                                    {
+                                        "columns": [
+                                            {"width": 6, "extra_css": "px-4"},
+                                            {"width": 6, "extra_css": "px-4"},
+                                            {"width": 6, "extra_css": "px-4"},
+                                            {"width": 6, "extra_css": "px-4"},
+                                        ]
+                                    },
+                                ],
+                            },
+                            {
+                                "width": 6,
+                                "rows": [
+                                    {
+                                        "columns": [
+                                            {"width": 12, "extra_css": "px-4"},
+                                            {"width": 6, "extra_css": "px-4"},
+                                            {"width": 6, "extra_css": "px-4"},
+                                        ]
+                                    }
+                                ],
+                            },
+                        ]
+                    },
+                ]
+            },
+        )
+
     paginate_by = 50
 
     def get_queryset(self):
diff --git a/hawc/apps/mgmt/filterset.py b/hawc/apps/mgmt/filterset.py
index ec9c296651..7dd5a72fc3 100644
--- a/hawc/apps/mgmt/filterset.py
+++ b/hawc/apps/mgmt/filterset.py
@@ -2,7 +2,7 @@
 from django.forms.widgets import CheckboxInput
 from django_filters.constants import EMPTY_VALUES
 
-from ..common.filterset import BaseFilterSet
+from ..common.filterset import BaseFilterSet, FilterForm
 from ..myuser.models import HAWCUser
 from ..study.constants import StudyTypeChoices
 from . import models
@@ -33,6 +33,7 @@ class UserTaskFilterSet(BaseFilterSet):
 
     class Meta:
         model = models.Task
+        form = FilterForm
         fields = ["assessment_name", "study_name", "type", "show_completed"]
         grid_layout = {
             "rows": [
@@ -46,17 +47,6 @@ def filter_show_completed(self, queryset, name, value):
         return queryset.exclude_completed_and_abandonded()
 
 
-class AssessmentUserTaskFilterSet(UserTaskFilterSet):
-    class Meta(UserTaskFilterSet.Meta):
-        model = models.Task
-        fields = ["study_name", "type", "show_completed"]
-        grid_layout = {
-            "rows": [
-                {"columns": [{"width": 4}, {"width": 4}, {"width": 4}]},
-            ]
-        }
-
-
 class TaskFilterSet(BaseFilterSet):
     study_name = df.CharFilter(
         lookup_expr="icontains", field_name="study__short_citation", label="Study name"
@@ -84,6 +74,7 @@ class TaskFilterSet(BaseFilterSet):
 
     class Meta:
         model = models.Task
+        form = FilterForm
         fields = ["study_name", "data_type", "owner", "order_by"]
         grid_layout = {
             "rows": [
diff --git a/hawc/apps/mgmt/views.py b/hawc/apps/mgmt/views.py
index d43852b410..9c3dedb263 100644
--- a/hawc/apps/mgmt/views.py
+++ b/hawc/apps/mgmt/views.py
@@ -86,7 +86,7 @@ def get_context_data(self, **kwargs):
 
 
 class UserAssessmentTaskList(BaseFilterList):
-    filterset_class = filterset.AssessmentUserTaskFilterSet
+    filterset_class = filterset.UserTaskFilterSet
     model = models.Task
     parent_model = Assessment
     template_name = "mgmt/user_assessment_task_list.html"
@@ -102,6 +102,16 @@ def get_queryset(self):
             .order_by("study__short_citation", "type")
         )
 
+    def get_filterset_form_kwargs(self):
+        return dict(
+            dynamic_fields=["study_name", "type", "show_completed"],
+            grid_layout={
+                "rows": [
+                    {"columns": [{"width": 4}, {"width": 4}, {"width": 4}]},
+                ]
+            },
+        )
+
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
         context["breadcrumbs"].insert(2, mgmt_dashboard_breadcrumb(self.assessment))
diff --git a/hawc/apps/study/filterset.py b/hawc/apps/study/filterset.py
index f198c365a7..dc9b077c41 100644
--- a/hawc/apps/study/filterset.py
+++ b/hawc/apps/study/filterset.py
@@ -1,7 +1,7 @@
 import django_filters as df
 from django.db.models import Q
 
-from ..common.filterset import BaseFilterSet
+from ..common.filterset import BaseFilterSet, FilterForm
 from ..myuser.models import HAWCUser
 from . import constants, models
 
@@ -39,6 +39,7 @@ class StudyFilterSet(BaseFilterSet):
 
     class Meta:
         model = models.Study
+        form = FilterForm
         fields = ["citation", "identifier", "data_type", "published", "assigned_user"]
         grid_layout = {
             "rows": [
diff --git a/hawc/apps/summary/filterset.py b/hawc/apps/summary/filterset.py
index 1e1549d40d..941fdc53a4 100644
--- a/hawc/apps/summary/filterset.py
+++ b/hawc/apps/summary/filterset.py
@@ -1,7 +1,7 @@
 import django_filters as df
 from django.db.models import Q
 
-from ..common.filterset import BaseFilterSet
+from ..common.filterset import BaseFilterSet, FilterForm
 from . import constants, models
 
 
@@ -23,6 +23,7 @@ class VisualFilterSet(BaseFilterSet):
     class Meta:
         model = models.Visual
         fields = ["title", "type", "published"]
+        form = FilterForm
         grid_layout = {
             "rows": [
                 {"columns": [{"width": 6}, {"width": 3}, {"width": 3}]},
@@ -114,6 +115,7 @@ class SummaryTableFilterSet(BaseFilterSet):
     class Meta:
         model = models.SummaryTable
         fields = ["title", "type", "published"]
+        form = FilterForm
         grid_layout = {
             "rows": [
                 {"columns": [{"width": 6}, {"width": 3}, {"width": 3}]},
diff --git a/hawc/apps/summary/views.py b/hawc/apps/summary/views.py
index f0d5cfe540..dd26464da1 100644
--- a/hawc/apps/summary/views.py
+++ b/hawc/apps/summary/views.py
@@ -258,11 +258,13 @@ def get_object(self):
         return obj
 
 
-class VisualizationList(BaseList):
+class VisualizationList(BaseFilterList):
     parent_model = Assessment
     model = models.Visual
     breadcrumb_active_name = "Visualizations"
 
+    filterset_class = filterset.VisualFilterSet
+
     @property
     def visual_fs(self):
         if not hasattr(self, "_visual_fs"):
diff --git a/hawc/static/css/hawc.css b/hawc/static/css/hawc.css
index 3bb963d706..82818133d6 100644
--- a/hawc/static/css/hawc.css
+++ b/hawc/static/css/hawc.css
@@ -569,6 +569,21 @@ div.smart-tag.active {
     cursor: pointer;
 }
 
+/* custom inline filterset forms */
+.form-sm-field {
+    font-size: 0.88rem;
+    height: auto;
+    width: auto;
+    border-radius: 0;
+    line-height: 1.7;
+}
+
+#ff-expand-form {
+    border-radius: 0 0 10px 10px;
+    box-shadow: rgb(127 142 153 / 31%) 0px 8px 15px;
+    background-color: #eaf6ff;
+}
+
 /* BMD APPLICATION STYLES */
 
 /* BMD output table */
diff --git a/tests/integration/test_lit.py b/tests/integration/test_lit.py
index 4d8cc0f05f..f1817ad51c 100644
--- a/tests/integration/test_lit.py
+++ b/tests/integration/test_lit.py
@@ -31,8 +31,8 @@ def test_literature(self):
 
         # /lit/assessment/:id/references/search/
         page.goto(self.live_server_url + "/lit/assessment/2/references/search/")
-        page.locator("text=Filter references").click()
-        page.locator("input[name=authors]").fill("Kawana")
+        page.locator("#ff-expand-form-toggle").click()
+        page.locator("input[name=ref_search]").fill("Kawana")
         page.locator("text=Apply filters").click()
         expect(page.locator("text=References (1 found)")).to_be_visible()