fix for array types and add defaults for dataSource params