fix #803 fix links in multi-tier with storage #5