Fixed bugs with ListBox selection