Merge change I2a7e4e10 into eclair

* changes:
  Make secondary edit entries unvisible if no data kind for it.