I think I would completely remove the sorting here: sorting should now occur in the templates, right?