updated user logic
Merge pull request #59 from domestic/feat/user_filter

updated user logic