refactorings in the content broker