2 files changed, 4 insertions, 3 deletions
diff --git a/src/main/scala/xyz/driver/pdsuidomain/services/fake/FakeTrialService.scala b/src/main/scala/xyz/driver/pdsuidomain/services/fake/FakeTrialService.scala
index e0efcd1..e23449c 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/services/fake/FakeTrialService.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/services/fake/FakeTrialService.scala
@@ -85,7 +85,8 @@ class FakeTrialService extends TrialService {
           generators.setOf(LongId[EligibilityArm](generators.nextInt(999999).toLong)),
           generators.nextName().value,
           generators.nextBoolean(),
-          generators.nextBoolean()
+          generators.nextBoolean(),
+          generators.nextOption(generators.nextBoolean())
         ))
     )
 
diff --git a/src/main/scala/xyz/driver/pdsuidomain/services/rest/RestHelper.scala b/src/main/scala/xyz/driver/pdsuidomain/services/rest/RestHelper.scala
index 0ff29ef..7275e3c 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/services/rest/RestHelper.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/services/rest/RestHelper.scala
@@ -57,9 +57,9 @@ trait RestHelper {
     def exprToQuery(expr: SearchFilterExpr): Seq[(String, String)] = expr match {
       case SearchFilterExpr.Empty => Seq.empty
       case SearchFilterExpr.Atom.Binary(dimension, op, value) =>
-        Seq("filters" -> s"${dimension.name} ${opToString(op)} $value")
+        Seq("filters" -> s"${dimension.tableName.fold("")(t => s"$t.") + dimension.name} ${opToString(op)} $value")
       case SearchFilterExpr.Atom.NAry(dimension, SearchFilterNAryOperation.In, values) =>
-        Seq("filters" -> s"${dimension.name} in ${values.mkString(",")}")
+        Seq("filters" -> s"${dimension.tableName.fold("")(t => s"$t.") + dimension.name} in ${values.mkString(",")}")
       case SearchFilterExpr.Intersection(ops) =>
         ops.flatMap(op => exprToQuery(op))
       case expr => sys.error(s"No parser available for filter expression $expr.")