Fix client side template mapping