Applying SmallJoker's suggestion

Simplified locale search