Clarified and shrunk the filter logic
Squeezed more re-use out of the different filter types
Adding date expressions to filters