Fixed crashes caused by last commit
Added Filter button