* added url makers
* added undefined check to report query normalizer