Fix bug 001
Improve person search