filter User added
select role fixed
some code fix
Merge branch 'master' into filter-user
fix test