Add images if only HVs report them, and add image info to debug cluster query