Added more ways of filtering for patient list