Improve Select field