bug fix for the user filter
Merge branch 's-hist' into staging2