Map fields for retrieve fields and sort
Merge pull request #44 from jrschumacher/enhance-mapfield

Map fields for retrieve fields and sort