Fix problem with HV cluster ordering and also fix sharing of hits