fix match and boolean expression