#5 Fixing sort order issues.