tighter partial name check