Complete the searching issues, tested and fixed some bugs.