Some fixes for the "group of images" functionality.