Move calculateDataRecency to indicator model, not page