change filter to include keys and values