some more refactoring of reordering favorites