UploadedTo: update regex to fix bug #62
+ cosmetics