improve hlr support