Add if statements so that full group will be run if subset is not specified or is False