and some stuff to make favorites still work This reverts commit 039a4074006fb91ac9031b41b4e9af4a15766dfa.