Cleanup.
Fix favorites ordering.