added expressions to where condition #42