Refactor: Improve query hooks and update dependencies

Commit notes

This commit refactors query hooks for better organization and adds utility functions. It also updates dependencies and cleans up imports.

Co-authored-by: armin.naimi <[email redacted]>