[CLC-1640] Changes to the drive list feed for badges
[CLC-1640] Clean up syntax
Merge pull request #951 from yuhunglin/CLC-1640

[CLC-1640] Changes to the drive list feed for badges