Issue 91 search bug