Force inclusion of PK/FK in certain circumstances

In case Include in List Query has been set to "No" for table PK or join
FK, then we force these to be included if any other element in the group
is included.