Fix logic in data group controller for initial state