Remaining changes to control condition

These are the changes made to the control condition after the first pull request.
If you want to simplify this further you can compress the above two lines into: 
return [self isSubject:correctSubject ContainedInGroupWithObject:subject];