Fixed user filters. Added two API calls.
Merge branch 'master' into demo