Fixes null check with filtered content/media attribute, fixes issue with container types and rendering tree nodes.