note: this mr will break current behavior and require adjustments in the frontend @Robin @timohenzakamude