add search filter
fix unit test