Additional clean up of query code. Closes: #1935 BREAKING CHANGE: By default Query only queries direct children.