Removed incorrect use of || in case..when statements.