Move moved queries to server