#297: Change to select list