[issue #36] using correct dataitem category
Merge branch 'bug/36-wrong-dataitem-category' into dev