Moved locale query parameter logic up one level since en_us was sometimes overriding the specified value