Follow-ups to https://sbprojects.statsbiblioteket.dk/jira/browse/NO-210
https://sbforge.org/fisheye/cru/CR-NEWSPAPER-212