FLUID-5362: fixed the table and links