Fixed TreeMapper and dataIndex issues