Actually filter by when + where