Track target blocks by $index

Removes the $$hashKey from the targets.

Ref #1207