Make time-series references aware of correct Grid

Fix #508
Make time-series references aware of correct Grid