improvement: tightening of validation rules
Merge d:/Projekte/yaio-playground