New data/metadata display started and better endpoint handling