added code to handle webcomponents with local array datasource, need to test when hotfix comes first