fixed searching issues