Couple of fixes for Publish Filtering. RE: #1996