more updates to rvtools query