Fix sorting, fix titles