Fix issue with list ordering and events