query: Fix some broken attribute names