Improve the data value filter to cover item stacks as well