Add filter and test
Add search service