Sounds like you found a solution. I recall this happening to me many months back, but I’ve since switched almost everything I can to repeaters, since they’re much more versatile. If it still persists id consider making a repeater appear as if it is just a gallery.