search function improved