Merge branch 'web/fix-2025-06-02' into 'main'

Web/fix 2025 06 02

See merge request legtvar/pivo!16