refactoring
Use query instead of path