integrated feedback from basti https://github.com/userdatamanifesto/www/pull/4/files#r16707982