Change in user filter and added some validations
Merge branch 'master' of https://github.com/EVRI-TEAM/Evri_Charity-Portal.git