fix switch issue, add check on multiple values