added active filters logic
clear code
Merge remote-tracking branch 'origin/master'
modify filter count