Fix search bug #16