Add filter-set bean declation seperate