Fix sort order, fix entity field bug (still needs work), remove error field.