Paranoid: don't required non conditional queries

closes #1697