Feature/zen 11976

Filter images and volumes that we are not modelling from being added to relationships over and over again and never being set properly.

Fixes ZEN-11976