Fixes for happymapper template