Rename FilterKey and FilterValue to TagKey/TagValue