Paranoid: don't required non conditional queries

closes #1697
Remove spacings to follow syntax

I know that can mess up PR but is needed.
Paranoid: if required, don't change nothing, otherwise mark required as false
Revert: "Paranoid: don't required non conditional queries"
Add test unit for required check
Merge pull request #1698 from cusspvz/master

Paranoid: don't required non conditional queries
Merge remote-tracking branch 'upstream/master'