fix favorite remove
some fix
Merge origin/ardfo into ardfo