Fix: Order of queries