Update RemoteQuery and RemoteQueryServlet