Trello 260

dataset fixes
Trello 260

group fixes