Fix bug in UriTemplate for query params with multiple keys

Also fixed some spelling errors