no videoplayer.content includes (reverse-merged from commit 57fa9bad1702cceded16a49864e494d207a2cb07)
--introduces other bugs probaby because of duplicate ids