Merge pull request #369 from CruGlobal/MH-1010v2

Should use the filtered people from parameter
Fix mysql ambiguous columns error
Merge branch 'master' into dev