Improve badges rendering
Improve filters rendering