Filter and togggle class with params done
Merge origin/master