bug 126 - fix main search