Moves filters around and uses current date for date filtering

... which addresses some issues with #85
Yeah. We had two, one at 600 and one at 1060. Now we only need one at 1060 because of the way it's split up.