rewrote all search/filter