A little cleanup.
I think everything is working. All filters are now optional as well.