Fixed some bugs with favorites