Update to prevent duplicate question mark delimiters