Search error fix, Issue #8