Content Views: several fixes for changes in filters, rules and puppet modules