Improved locale listener fallback to default