Fixing badge type filtering

Resolved #559
Fixing badge type filtering

Resolves #558
Merge pull request #573 from andrewhayward/tweaks

Fixing badge type filtering