Improve donor search functionality #164

Improve donor search (see #164)