Moved filtering to contentPublish class