Remove trailing comma.
Split results into categories

- also add more categories