Make queries stricter