Added filter modal and service