Added parenthesis to AND/OR expression.
Added more expression, catch up change of ASE.
Fixed expressions.