diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/report/ComposableTableReportFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/report/ComposableTableReportFragment.kt
index 9f054949..4fddc017 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/report/ComposableTableReportFragment.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/report/ComposableTableReportFragment.kt
@@ -12,11 +12,11 @@ import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.async
 import kotlinx.coroutines.launch
 import net.pokeranalytics.android.R
-import net.pokeranalytics.android.calculus.calcul.ReportDisplay
 import net.pokeranalytics.android.calculus.Calculator
 import net.pokeranalytics.android.calculus.ComputableGroup
 import net.pokeranalytics.android.calculus.Report
 import net.pokeranalytics.android.calculus.Stat
+import net.pokeranalytics.android.calculus.calcul.ReportDisplay
 import net.pokeranalytics.android.databinding.FragmentComposableTableReportBinding
 import net.pokeranalytics.android.exceptions.PAIllegalStateException
 import net.pokeranalytics.android.ui.activity.components.ReportActivity
@@ -156,25 +156,17 @@ open class ComposableTableReportFragment : RealmFragment(), StaticRowRepresentab
 	private fun convertReportIntoRepresentables(report: Report): ArrayList<RowRepresentable> {
 
 		val rows: ArrayList<RowRepresentable> = ArrayList()
-		report.results.forEach { result ->
-			val title = result.group.query.getName(requireContext()).capitalize()
-			rows.add(CustomizableRowRepresentable(title = title))
-			val statList = result.group.displayedStats ?: report.options.stats
-			statList.forEach { stat ->
-				rows.add(StatRow(stat, result.computedStat(stat), result.group.query.getName(requireContext())))
+		this.context?.let { context ->
+			report.results.forEach { result ->
+				val title = result.group.query.getName(context).capitalize()
+				rows.add(CustomizableRowRepresentable(title = title))
+				val statList = result.group.displayedStats ?: report.options.stats
+				statList.forEach { stat ->
+					rows.add(StatRow(stat, result.computedStat(stat), result.group.query.getName(context)))
+				}
 			}
 		}
 		return rows
-
-//		val rows: ArrayList<RowRepresentable> = ArrayList()
-//		report.options.stats.forEach {stat ->
-//			rows.add(CustomizableRowRepresentable(title = stat.localizedTitle(requireContext())))
-//			report.results.forEach {
-//				val title = it.group.name
-//				rows.add(StatRow(stat, it.computedStat(stat), it.group.name, title))
-//			}
-//		}
-//		return rows
 	}
 
 	// RowRepresentableDelegate
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/modules/filter/FilterDetailsViewModel.kt b/app/src/main/java/net/pokeranalytics/android/ui/modules/filter/FilterDetailsViewModel.kt
index 2c39c36c..fcca1b00 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/modules/filter/FilterDetailsViewModel.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/modules/filter/FilterDetailsViewModel.kt
@@ -31,7 +31,7 @@ class FilterDetailsViewModel(categoryRow: FilterCategoryRow, var filter: Filter)
 		this.defineSelectedItems()
 	}
 
-	override fun adapterRows(): List<RowRepresentable>? {
+	override fun adapterRows(): List<RowRepresentable> {
 		return this.rows
 	}
 
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/view/rows/FilterItemRow.kt b/app/src/main/java/net/pokeranalytics/android/ui/view/rows/FilterItemRow.kt
index 7555d963..b839f5da 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/view/rows/FilterItemRow.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/view/rows/FilterItemRow.kt
@@ -105,7 +105,7 @@ open class FixedValueFilterItemRow(queryCondition: QueryCondition,
         get() { return rawCondition }
 
     override fun valueFormatted(context: Context): CharSequence? {
-        throw PAIllegalStateException("Not applicable for $rawCondition")
+        return null //throw PAIllegalStateException("Not applicable for $rawCondition")
     }
 
     override val singleValue: Any?