Fix syntax conflict with role filtering, and passing two roles