fix sort order bug and include sample data