Merge pull request #263 from rjc123/master

Update mappings to resolve zendesk queries