fixes for content_controller