start work with filter manager
change filter manager
finished work with FilterManager
Merge branch 'FilterManager'
small fix