Revert "Filter using an expression"

This reverts commit 39164022e6b2ca3f1d7ca3b5c6a407f7dc656b90.
Ensure historical data is returned