added filter for current_user
Merge pull request #632 from YaleSTC/632_542_613

#613 introduces test failures