[OE-3561] fixed validation and view mode