added proper handling of uploads-listing