Fixed up the fill method
Filtering where clauses