Merge pull request #786 from nabinhait/hotfix

Minor fix for filename
Fixed in comment
Fixes for mapping fetch fields