Fix query parser; finish concat tests.