fix if expressions and solve "no value" issue introduced yesterday