Indexing / Sorting of Filles/pictures

I have Ultra and Original Blue Lima. and have connected 2 of my Phones (Galaxy s7)

The problem here is, all the pictures and videos of both the phones are combined now in the same Mobile Flow folder. - and there is no option also for sorting by date. It has some default sorting method which we cant change. I have to browse thru complete folder to find any pictures.

Pls allow either selecting folders while Auto uploading of camera folder / video from the new device. So that we can name each phone / device.