@abenari, do you recall why you put `.reorder('type, name')` here?  If yes, then I can put it back.