Little improvements for "select"