Better query coverage