Fixed problems with select key