Add test for, and fix, Query..or()