JARVIS-338 JARVIS-359 query route
JARVIS-338 Reduced dep level