Minor changes to use select list