Answering my own question here.
I found this thread with the same issue. This is a known limitation and the answer is to use a bit of ruby to convert fields that have dynamic field names.
I'm going to try and find an example bit of ruby and post it back here.
And possibly here too.