Update and & or conditions handing