fix lists and items ordering