r1342 + reverted previous sorting hack, as it screwed rackspace view