image search adapted
fixed merge conflicts