Changes in Filter
Solved filter problems
Fixed last problems.
Merge branch 'master' into Solfamidas