task #9696 - right sidebar fixes