[#985252] Bug fixes for when changed to flickr.