fixed up some publisher related code and filtering