Make query path don't deal with trailing slash
Make query path don't deal with trailing slash