Adding additional things missing for proper option handling

Continuation of !111 (merged)

Merge request reports

Loading