Made all 4 demo queries work