- cleaning up the search diagnostics a bit