Fixing filter in edit mode
Merge branch 'awesome'