Added data-hooks where values were empty and fixed some repeated ids.

Fixe #4573