Fixes to upload links handling