Fixing up path queries