fix favorite and list
merge to master production