Refactor top activties aggregation logic

It used to aggregate 'Biking, nil' as 'Biking', which is somewhat
inaccurate b/c when I click on 'Biking', I expect to see all 'Biking'
activities, not just those without a secondary type.