[#664] Fix Group selector in dataset forms
Merge branch '664-group-form-issues'