add entity search,refactor