Fix #1294: Query string arguments in incoming URL cannot be unset using null when generating current route