LIB001-566: Fixing weirdness of related items
Merge pull request #63 from ianthe/LIB001-556

LIB001-556: Fixing weirdness of related items