Again, final final update concerning queries