Better logic for non-selected modules / groups