Partial fixes to sidebar favoriting behavior