Improved reordering mechanics of ByPropertyIdArray

Change-Id: I3d4ff8648dad27ce3754a3d302af43797a5a202c