Fix typo in Person.in (SmartDemo & Dev)
Fix minor bugs introduced by search comparators
Standardize Terms naming convention