Small refactoring
Refactoring + adding pagination to diseaseByTarget