Use 'and' in query only for >1 clauses.

This addresses issue #2.