Actually sort entity fields