Add sorter on demand. Fix sorting on FK values