Adding path-with-query-for and tests, fixing up docs