#205, aligned new modifications also in viewer template