listbox code review fixes