fix for URIQuery and some doc