Client index bug fix on link to id