Improve donor search functionality #164