[Harmattan] adopt harmattan reader to new data models and fix some smaller issues