Avoid using internal path_query method.
Merge pull request #50 from kaspth/rm-path-query

Avoid using internal path_query method.