need to fix the separation of the queries to the server