Figarocorso/filter fix

I've compiled and deployed this branch and it seems that everything UI-related is working ok. It is hard to say after the merge from master, but I do think so after some manual testing.