CP Photo Finder improved