Add option to always use iso codes