More bug fixing in search renderer
Finally fix some search render bugs