* Fix to make sure we have the correct dataIndex when using data links.

* fixed strict null errors.

* decreased number of errors.