Added where_clause to other missing places