Fix jstree pagination/fields for several edge cases