Improved building of WHERE clause in SQL Builder.