Further improves namefind