Took care of some #TODO comments in the filter manager