Cleanup.  Fixed issue where query strings were locked.