improved ordering and sectioning of entries