Reworking of locale resolving