fixed comment link logic
server updates for new api extension
client updates for new api extension