donations search query refactored