Extend "inactive" mapping to lookup/match