Add battle finder
Add battle finder
Add name field support