added parsing of uri and query