Improved handling of '?' in GetData script