Fixed filter completely
Merge origin/master