Issue 333 ebi xml gen and sub

Missing return sections