Added the favorite option. DB Update!
manual merge.