More bugfixes

Two more bugs have been fixed that caused the wrong content to be displayed (or nothing to be displayed at all).
The first of which has been introduced with the last patch.