include possible attached media and source properties. fixes #138