fixing the server query as the current one does not seemd to work