Move image search from strategy to ImageService.

Addressed to #132

No functional changes.