Fix id passing
Merge branch 'fix-id-passing-content-viewer' into 'stable'

Fix id passing on content viewer

See merge request !329