r11323: add uri-query-to-alist