fix template keys

Built on top of #22 

closes #13