WIP - Implement where clause printing
Update samples with where clauses