Add default of 1, switch from OR to AND