LIB001-556: Fixing weirdness of related items