Refactoring queries - TanStack