Corrected the return of duplicate occurences of some entity flag types.
Merge pull request #14 from md-systems/fixedDuplicateFlagTypeOccurences

Corrected the return of duplicate occurences of some entity flag types.