adding agency filter back in
Merge branch 'master' into setravi