Fixed bugs : The router fails with queries