Fix query navigation in cases vanilla models are encountered deeper.