Wrong H-tags improved