Oops, merge favorite filtering back in after conflict