More wrestling with market source field names.