The fix for this seems to be quite straight forward. The sort algorithm needs to also take into account embeddable(s) and navigate association paths inside those types just like we do entity associations to make sure that the buckets get ordered properly.