Code Cleanup and move the search result image config

:v
Revert "Code Cleanup and move the search result image config"

This reverts commit df2863764872ad945bcf7f5e981384319128d2b8.