Fix issue with order of items in lists