Reply To: linking map to data

#6207

Yay!