Bring queries back in