Fixed queries

blarghhhh