move search/filter to criteria
fix some filter redirects