Searchfilters

Ready to merge filters and search