Should fix the loading of favorites