MDL-36804: Fix remaining broken queries.
MDL-36804: Change default for add attempt from yes to no.