CLSN-1664 use location code for location field everywhere