diff --git a/mo/web/org_contest.py b/mo/web/org_contest.py
index 34d55e0ec4c3fe759b0a06dfeb5097274e1e78e3..755f7b4d51a1de26ce095cf636bab450981eab06 100644
--- a/mo/web/org_contest.py
+++ b/mo/web/org_contest.py
@@ -421,15 +421,13 @@ def org_contest_list(id: int, site_id: Optional[int] = None):
     filter = ParticipantsFilterForm(formdata=request.args)
     if request.args:
         filter.validate()
-    f_participation_state = filter.participation_place.data
-    if not f_participation_place:
-        f_participation_place = "*"
+
     query = get_contestants_query(
         round=master_contest.round, contest=master_contest, site=site,
         school=filter.school.place,
-        # contest_place=filter.f_contest_place,
-        participation_place=filter.participation_place.data,
-        participation_state=f_participation_state
+        contest_place=filter.contest_place.place,
+        participation_place=filter.participation_place.place,
+        participation_state=mo.util.star_is_none(filter.participation_state.data),
     )
 
     action_form = None
diff --git a/mo/web/org_round.py b/mo/web/org_round.py
index 0a9dd7986c24f92871a61c481026324909221404..ad64f29ec2a34359b4263ec9e4c6947eaedd65e4 100644
--- a/mo/web/org_round.py
+++ b/mo/web/org_round.py
@@ -357,10 +357,10 @@ def org_round_list(id: int):
     filter.validate()
     query = get_contestants_query(
         round=master_round,
-        school=filter.f_school,
-        contest_place=filter.f_contest_place,
-        participation_place=filter.f_participation_place,
-        participation_state=filter.f_participation_state,
+        school=filter.school.place,
+        contest_place=filter.contest_place.place,
+        participation_place=filter.participation_place.place,
+        participation_state=mo.util.star_is_none(filter.participation_state.data),
     )
 
     action_form = None