Bugfix/6655 sidebar updates