enhancement for flickr like issue