Minor refactoring: change field name of the 'SmartRow' namedtuple
Implement a more robust smart matching