Support migrating non-recursive path queries.
Support migrating multiple path queries.
Removed unneeded commented out line.