Fixed select-list functionality