DDBNEXT-485: minor design issues fixed