Field templates fix