cleaned + extenden last foscarini commit regarding default sort order