Aurion QueryID length

My Aurion QueryID is 16 characters long, but because we are sending a parameter/option with the queryID (i.e. my QueryID field is like: query1234567890a,XML_FILE_PATH=file.xml) I am getting the validation error message.

Import all entities from connector failed.
Import all entities from connector AurionDEVPerson failed with reason QueryId cannot exceed 16 characters
Parameter name: queryId. Duration: 00:02:06.0296668
Error details:
System.ArgumentOutOfRangeException: QueryId cannot exceed 16 characters
Parameter name: queryId
at Unify.Communicators.AurionAgent.QueryToXml(String queryId, String expectedObjectName)
at Unify.Connectors.AurionApiReadingConnector.<GetAllEntities>d__4.MoveNext()
at System.Linq.Enumerable.WhereSelectEnumerableIterator`2.MoveNext()
at Unify.Framework.Collections.ActionOnExceptionEnumerator`1.MoveNext()
at Unify.Framework.Collections.EnumerableExtensions.<ActionOnLast>d__10`1.MoveNext()
at Unify.Framework.Collections.EnumerableExtensions.<ProduceAutoPages>d__7`1.MoveNext()
at Unify.Framework.Visitor.ThreadsafeVisitorEvaluator`1.Visit()
at Unify.Product.IdentityBroker.RepositoryChangeDetectionWorkerBase.PerformChangeDetection(IEnumerable`1 connectorEntities)
at Unify.Product.IdentityBroker.ChangeDetectionImportAllJob.ImportAllChangeProcess()
at Unify.Product.IdentityBroker.ChangeDetectionImportAllJob.RunBase()
at Unify.Framework.DefinedScopeJobAuditTrailJobDecorator.Run()
at Unify.Product.IdentityBroker.ConnectorJobExecutor.<>c__DisplayClass33_0.<Run>b__0()
at Unify.Framework.AsynchronousJobExecutor.PerformJobCallback(Object state)

I see from this

http://voice.unifysolutions.net/topics/326-improve-error-message-when-queryid-exceeds-maximum-length/

that this is desired/expected behaviour, but could we please either only validate that string up to the comma or add a field for any parameters that we want to append?