Fixes uploader and Sorting