refactored filtering service and repo usage of filter service