Fixed a problem with bool query arguments
merged and resolved conflicts