[Temporary] Swap out search for IntervalTree

- This seems to make it actually worse…