Add Favourite Column
Fix inconsistent tagging