Only show analysis spinner when finished uploading
Use slightly different field names