Better history and timestamps
Peristing filters too
Adding persistence to the filter