HAL-492: Fix URL fragment problem