+ Improved filter logic
+ Added filter translations