Heri|#2327: Fixing defects for website changes