New mappings after querystring support implemented
Merge pull request #132 from rjc123/newmappings

New mappings after querystring support implemented