adding locale search support