Add insurer in header + fixes