improved handling of favorites