Bug fixes

- null data source exception if data provider is not defined
- word inserting bug