Improved sorting (normalised filenames)