Improve logic of displaying profile images

Improve the logic of displaying images in the event profile carousel when multiple people and vehicles are involved so the order goes like this: Person 1, images 1,2,3,4 then Person 2, images 1,2,3,4 then Vehicle 1, images 1,2,3,4 then Vehicle 2, images 1,2,3,4.