Revert "Access to query components"

This reverts commit 9842a809e1841b754679b912dbb6a51f9690d14d.