Feature/filter participant on shedules

Fixed the bug and the code layout.