Moving filter in external module. First Attemp
Merge branch 'develop'