Fix group generation and question enumeration issues