PIM-1890: Improve Icecat data