#22 org_type was added to filter conditions for selectors