diff --git a/app/src/main/java/net/pokeranalytics/android/model/filter/QueryCondition.kt b/app/src/main/java/net/pokeranalytics/android/model/filter/QueryCondition.kt
index 180c2085..115cfd97 100644
--- a/app/src/main/java/net/pokeranalytics/android/model/filter/QueryCondition.kt
+++ b/app/src/main/java/net/pokeranalytics/android/model/filter/QueryCondition.kt
@@ -594,7 +594,7 @@ sealed class QueryCondition : RowRepresentable {
 		}
 	}
 
-	class PastDay(value: Int) : SingleInt(value) {
+	class PastDay(value: Int) : UserInputSingleInt(value) {
 		override var operator = Operator.EQUALS
 		override val viewType: Int = RowViewType.TITLE_VALUE_CHECK.ordinal
 
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/FilterItemRow.kt b/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/FilterItemRow.kt
index 0f60bc85..e8cc52d1 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/FilterItemRow.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/FilterItemRow.kt
@@ -104,11 +104,11 @@ open class FixedValueFilterItemRow(queryCondition: QueryCondition,
         get() { return rawCondition }
 
     override fun valueFormatted(context: Context): CharSequence? {
-        throw PAIllegalStateException("Not applicable")
+        throw PAIllegalStateException("Not applicable for $rawCondition")
     }
 
     override val singleValue: Any?
-        get() { throw PAIllegalStateException("Not applicable") }
+        get() { throw PAIllegalStateException("Not applicable for $rawCondition") }
 
 }
 
diff --git a/app/src/main/res/layout/fragment_filter_details.xml b/app/src/main/res/layout/fragment_filter_details.xml
index bab049a9..710f3260 100644
--- a/app/src/main/res/layout/fragment_filter_details.xml
+++ b/app/src/main/res/layout/fragment_filter_details.xml
@@ -1,61 +1,37 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
-	xmlns:tools="http://schemas.android.com/tools"
+	android:id="@+id/mainLayout"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent">
 
-	<androidx.core.widget.NestedScrollView
-		android:id="@+id/nestedScrollView"
-		android:layout_width="match_parent"
-		android:layout_height="match_parent"
-		android:fillViewport="true"
-		app:layout_behavior="@string/appbar_scrolling_view_behavior">
-
-		<androidx.constraintlayout.widget.ConstraintLayout
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content">
-
-			<androidx.recyclerview.widget.RecyclerView
-				android:id="@+id/recyclerView"
-				android:layout_width="0dp"
-				android:layout_height="0dp"
-				app:layout_constraintBottom_toBottomOf="parent"
-				app:layout_constraintEnd_toEndOf="parent"
-				app:layout_constraintStart_toStartOf="parent"
-				app:layout_constraintTop_toTopOf="parent" />
-
-		</androidx.constraintlayout.widget.ConstraintLayout>
-
-	</androidx.core.widget.NestedScrollView>
-
 	<com.google.android.material.appbar.AppBarLayout
 		android:id="@+id/appBar"
-		android:layout_width="match_parent"
-		android:layout_height="128dp"
-		android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar">
-
-		<com.google.android.material.appbar.CollapsingToolbarLayout
-			android:id="@+id/collapsingToolbar"
+		android:layout_width="0dp"
+		android:layout_height="wrap_content"
+		android:theme="@style/PokerAnalyticsTheme.Toolbar.Session"
+		app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintStart_toStartOf="parent"
+		app:layout_constraintTop_toTopOf="parent">
+
+		<androidx.appcompat.widget.Toolbar
+			android:id="@+id/toolbar"
 			android:layout_width="match_parent"
-			android:layout_height="match_parent"
-			app:collapsedTitleTextAppearance="@style/PokerAnalyticsTheme.Toolbar.CollapsedTitleAppearance"
-			app:contentScrim="?attr/colorPrimary"
-			app:expandedTitleGravity="bottom"
-			app:expandedTitleMarginStart="72dp"
-			app:expandedTitleTextAppearance="@style/PokerAnalyticsTheme.Toolbar.ExpandedTitleAppearance"
-			app:layout_scrollFlags="scroll|exitUntilCollapsed|snap">
-
-			<androidx.appcompat.widget.Toolbar
-				android:id="@+id/toolbar"
-				android:layout_width="match_parent"
-				android:layout_height="?attr/actionBarSize"
-				app:layout_collapseMode="pin"
-				app:title="Poker Analytics"
-				app:titleTextColor="@color/white" />
-
-		</com.google.android.material.appbar.CollapsingToolbarLayout>
+			android:layout_height="?attr/actionBarSize"
+			app:layout_constraintEnd_toEndOf="parent"
+			app:layout_constraintStart_toStartOf="parent"
+			app:layout_constraintTop_toTopOf="parent"
+			app:title="@string/reports" />
 
 	</com.google.android.material.appbar.AppBarLayout>
 
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
+	<androidx.recyclerview.widget.RecyclerView
+		android:id="@+id/recyclerView"
+		android:layout_width="0dp"
+		android:layout_height="0dp"
+		app:layout_constraintBottom_toBottomOf="parent"
+		app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintStart_toStartOf="parent"
+		app:layout_constraintTop_toBottomOf="@+id/appBar" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file