added more filter
added more searchables