Fix unfinished stage with rs-query-cloud.sh; add in rs_server support.