query generation refactor
implement route for non extxml providers