improve locale interceptor