Cleaning up filters so they can be exported

There were a few issues where two filters would not work well with each
other, or outside of our demo situation, so I fixed this and made it
more genearalized.
Fixed initialization issue with date picker