mandatory group selection #121

Also removing "state" field