fixed number and date filter
Merge pull request #26 from 0xBADC0FFEE/master

fixed number and date filter