Modified "WHERE" in each clauses in GetWhereClauses