TAP5-2273: Validation fix, improve documentation