Clean up Select sql method
Fix nesting of “or” and “and” query building statements
Closes #104