I added them were I am sure it is needed and won't break expected behaviour. It can probably be improved as I focussed on the use case of a banner block with media connected