New code for query string handling in CUrl