Added Filters To CoreData and Fixed Collection View Bug