Fix organization query and clean donor controller