Fix: CollectionViews now add data-type attribute correctly