Fix code for image collections, tried to polish product property choice type