Further clarifying logic over which mappings generator is being used
Removing need to set query string to undef