correcting offline behavior / templates