Revert "Fix query error"

This reverts commit 44e0d5f9f7765d80c0d3cc1e0441337316d7bbe5.