XCOMMONS-435 : Add a tool to sanitize query string. Some minor fixes