Search seems to be working better