Search with bug fix