Make some queries more explicit