Add back in tracking of query-string