move Flickr search to separate class, add some constraints