More media set controller refactorings