Solved one error filter
Merge branch 'filter'