Fixed custom context issue
Fix ES locale typo