Fixed issues with select states