Fixed names of states for redirection and checking