Revert "Remove hidden properties from the query statement"

This reverts commit 398c9b9823082050af0b7efaa25849695d799698.