Add id support to markup generator.
Simplify comparision table generation.
PP-4