improviments on the search