CDK-633: Update hive uris

Oh, so the query argument is always an option. That wasn't obvious. I still get lost in the URIPattern code.