Put back sql-based name formatting, otherwise sorting doesn't work.