EQ-497 Fixed section id conflicts