Better locale filtering

Fix #114