SF-2138 fixing FHB links