Started working on the searching and filter
Resolved conflicts