Moved filter setup into the service provider