Fixed aggregated count ordering and some minor formatting