Fix search segmenting issues