Added an ability to override endpoint-query providers in scenario. Fix u...

...sing of generator