[OE-2589] form validation and printing bugfixes