Handle image replace and image upload properly

waithing for a pull reqest on flickr-with-uploads