Some fixes for fileuploads
Reenable sort order
Merged