Update withOptionQueryParam to withMaybeQueryParam when it takes a Maybe