Live matches mapper improve