Fixed the filter bug so that it ends up looking okay on the plots