Fixing the normaliser to guess from country code