[IMP] Better handling of favorites events