minor refine on the name lookup rule

40 jobs for !2641 with NewFilter in 33 minutes and 16 seconds (queued for 1 second)
merge request