Fixed issues with image list being flattened incorrectly.