Modify query joins OR to AND