Fix EZP-21553: Make optional parameters really optional

JIRA issue: https://jira.ez.no/browse/EZP-21553

Fixed.