Name parser performance fixed, manual searches fixed.
Merge remote-tracking branch 'origin/dev'