DDBNEXT-631: validation errors fixed