support for complex Query conditions; cleanup
increment version