Moves filters around and uses current date for date filtering

... which addresses some issues with #85