Handle nil values with keys ending in question-marks