New mappings after querystring support implemented