Fix for data servers that have differently-spaced samples. Also data server in legend