Some search cleanup.