Where clauses modified to accept parenthesis