Fix 2 tracing issues around search

Created by: beyang

Fixes https://github.com/sourcegraph/sourcegraph/issues/13712

Also fixes a previous issue where zoekt spans were being nested under the incorrect frontend span.

Before:

Middle (after #13712 fix):

After: