Fix WHERE statement processing and add to QueryBuilder building routine