Fixed bugs with favorites