Search finished and some bugs patched