Add nonempty-vals as a workaround to group-by expiration issues