Fixed issue #12 - links in client views