7.x missing search image

This also fixes the bad positioning of highlights.