Multi-factor queries work now