ZD-10152: markup improved