Clean up agg_where to make it easier to understand
Clean up agg_where to make it easier to understand

clinwiki-org/clinwiki,clinwiki-org/clinwiki,clinwiki-org/clinwiki,clinwiki-org/clinwiki,clinwiki-org/clinwiki