use correct template tags; closes #288