Add a few optimizations to the Image Search
Add a few optimizations to the Image Search