Filters and notes now using `data` and `metadata` correctly