Content views: fixed a few things in CLI and UI