search: Fix type:path results counting (v2)

Created by: tsenart

This is an alternative to #29873 that keeps the merging of type:path and type:file results, which is necessary to keep not queries working, since they only return type:path results.