Merge branch 'web/fix-2025-05-30' into 'main'

Web/fix 2025 05 30

See merge request legtvar/pivo!13