add user Json
more change to return objects
add filter for userlist
fix merge conflict