Added favorite handeling