Improve "Watch on Dreambox" a bit