Fix add more conditions to the same field