Refactor queries to support participant type
TODO: Refactor default_participant