Fixed bug with filtering using ToData()