fixed Filter Service, and some other bugs