More rules for surrogates; Fix for cyndersource; Fix for inat images which are in Flickr