Feature/badges&filters