finish public user browse spec
merge ian_branch