#336 Improve QueryInit handling for delegate paths