Removed the need to write the data field in filter