Made imagefinder smarter