fixes #22 #24 and #25 where wrong template tags were introduced during the automatic change of translation keys in v2.2.0